Merge pull request #97 from 0xf10e/toggle_source_url

Add optional {{ source }} to config files
This commit is contained in:
Seth House 2017-06-22 01:05:42 -06:00 committed by GitHub
commit 8dbb1e9088
2 changed files with 15 additions and 0 deletions

View File

@ -73,6 +73,13 @@
# Do not edit this file manually! # Do not edit this file manually!
# It will be overwritten by salt! # It will be overwritten by salt!
{%- endif %} {%- endif %}
{%- set global_src_url = salt ['pillar.get']('__formulas:print_template_url', None) %}
{%- set local_src_url = salt ['pillar.get']('openssh-formula:print_template_url', None) %}
{%- if (global_src_url and local_src_url is none) or local_src_url %}
#
# Template used to generate this file:
# {{ source }}
{%- endif %}
{%- if 'Hosts' in ssh_config %} {%- if 'Hosts' in ssh_config %}
{%- do processed_options.append('Hosts') %} {%- do processed_options.append('Hosts') %}

View File

@ -66,6 +66,14 @@
{%- else -%} {%- else -%}
# This file is managed by salt. Manual changes risk being overwritten. # This file is managed by salt. Manual changes risk being overwritten.
{%- endif %} {%- endif %}
{%- set global_src_url = salt ['pillar.get']('__formulas:print_template_url', None) %}
{%- set local_src_url = salt ['pillar.get']('openssh-formula:print_template_url', None) %}
{%- if (global_src_url and local_src_url is none) or local_src_url %}
#
# Template used to generate this file:
# {{ source }}
#
{%- endif %}
# The contents of the original sshd_config are kept on the bottom for # The contents of the original sshd_config are kept on the bottom for
# quick reference. # quick reference.
# See the sshd_config(5) manpage for details # See the sshd_config(5) manpage for details