Merge pull request 'Add manage_sshd conditional' (#63 ) from sshd-optional into production

Reviewed-on: #63
Disable manage_sshd for philia
2023-05-02 19:39:20 +02:00 · 2023-05-02 19:32:36 +02:00 · 2023-05-02 19:30:33 +02:00
2 changed files with 3 additions and 0 deletions
--- a/pillar/id/philia_rigel_lysergic_dev.sls
+++ b/pillar/id/philia_rigel_lysergic_dev.sls
@ -0,0 +1 @@
+manage_sshd: False
--- 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 %}
Author	SHA1	Message	Date
Georg Pfuetzenreuter	9f176609a5	Merge pull request 'Add manage_sshd conditional' (#63 ) from sshd-optional into production All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Reviewed-on: #63	2023-05-02 19:39:20 +02:00
Georg Pfuetzenreuter	409016ea75	Disable manage_sshd for philia All checks were successful ci/lysergic/push/pipeline Pipeline was successful Details Machine uses a custom sshd configuration for $reasons. Signed-off-by: Georg Pfuetzenreuter <mail@georg-pfuetzenreuter.net>	2023-05-02 19:32:36 +02:00
Georg Pfuetzenreuter	8776b16be1	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 <mail@georg-pfuetzenreuter.net>	2023-05-02 19:30:33 +02:00