From e298397cc7ab081ee9e46bd94b783891dbcbff73 Mon Sep 17 00:00:00 2001 From: Florian Ermisch Date: Thu, 22 Jun 2017 00:03:28 +0200 Subject: [PATCH 1/2] add optional `{{source}} to ssh_config --- openssh/files/ssh_config | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openssh/files/ssh_config b/openssh/files/ssh_config index 4773791..ef07c9b 100644 --- a/openssh/files/ssh_config +++ b/openssh/files/ssh_config @@ -73,6 +73,13 @@ # Do not edit this file manually! # It will be overwritten by salt! {%- 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 %} {%- do processed_options.append('Hosts') %} From dbf51549ed83b61a644ed39bea058893e4997681 Mon Sep 17 00:00:00 2001 From: Florian Ermisch Date: Thu, 22 Jun 2017 00:03:35 +0200 Subject: [PATCH 2/2] add optional `{{source}} to sshd_config --- openssh/files/sshd_config | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openssh/files/sshd_config b/openssh/files/sshd_config index 9a75fe3..47c41f4 100644 --- a/openssh/files/sshd_config +++ b/openssh/files/sshd_config @@ -66,6 +66,14 @@ {%- else -%} # This file is managed by salt. Manual changes risk being overwritten. {%- 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 # quick reference. # See the sshd_config(5) manpage for details