From 8776b16be17eea6463f1adc60f2de6756e9f92a0 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 2 May 2023 19:30:33 +0200 Subject: [PATCH 1/2] Add manage_sshd conditional Allow sshd configuration to be skipped on "special" machines using an optional "manage_sshd: False" pillar option. Signed-off-by: Georg Pfuetzenreuter --- salt/common/ssh.sls | 2 ++ 1 file changed, 2 insertions(+) diff --git a/salt/common/ssh.sls b/salt/common/ssh.sls index 76033fd..f71e40d 100644 --- a/salt/common/ssh.sls +++ b/salt/common/ssh.sls @@ -1,5 +1,6 @@ include: - openssh.banner +{%- if salt['pillar.get']('manage_sshd', True) %} - openssh.config /etc/ssh/user_ca: @@ -10,3 +11,4 @@ include: {%- endfor -%} - require: - pkg: openssh +{%- endif %} -- 2.35.3 From 409016ea759c850d0d9761c1361915516d082577 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Tue, 2 May 2023 19:32:36 +0200 Subject: [PATCH 2/2] Disable manage_sshd for philia Machine uses a custom sshd configuration for $reasons. Signed-off-by: Georg Pfuetzenreuter --- pillar/id/philia_rigel_lysergic_dev.sls | 1 + 1 file changed, 1 insertion(+) create mode 100644 pillar/id/philia_rigel_lysergic_dev.sls diff --git a/pillar/id/philia_rigel_lysergic_dev.sls b/pillar/id/philia_rigel_lysergic_dev.sls new file mode 100644 index 0000000..e945f96 --- /dev/null +++ b/pillar/id/philia_rigel_lysergic_dev.sls @@ -0,0 +1 @@ +manage_sshd: False -- 2.35.3