summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Pfuetzenreuter2023-05-02 19:39:20 +0200
committerGeorg Pfuetzenreuter2023-05-02 19:39:20 +0200
commit9f176609a53be65b31139683c39c1264550d5f92 (patch)
tree9db4fa2c80007b947fda1a377599095a4433a98b
parent6763d1b64e0f8f50127b0c38b3bdf9a4582e2d3e (diff)
parent409016ea759c850d0d9761c1361915516d082577 (diff)
downloadsalt-9f176609a53be65b31139683c39c1264550d5f92.tar.gz
salt-9f176609a53be65b31139683c39c1264550d5f92.tar.bz2
salt-9f176609a53be65b31139683c39c1264550d5f92.zip
Merge pull request 'Add manage_sshd conditional' (#63) from sshd-optional into production
Reviewed-on: https://git.com.de/LibertaCasa/salt/pulls/63
-rw-r--r--pillar/id/philia_rigel_lysergic_dev.sls1
-rw-r--r--salt/common/ssh.sls2
2 files changed, 3 insertions, 0 deletions
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
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 %}