summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-02-18 12:08:34 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-02-18 12:08:34 +0100
commitbfe26ece4309dee8aaed2f9c911bb89333a33d06 (patch)
tree860332f41d05f716d88af2c6af6fbe6667df0de1
parent4fa50b540353d6739e36a9045ffbcf0951878bfd (diff)
downloadpuppet.KATH-bfe26ece4309dee8aaed2f9c911bb89333a33d06.tar.gz
puppet.KATH-bfe26ece4309dee8aaed2f9c911bb89333a33d06.tar.bz2
puppet.KATH-bfe26ece4309dee8aaed2f9c911bb89333a33d06.zip
site.pp: Only modify ldap.conf if HOST is not tjener.intern or ldap.intern.
-rw-r--r--code/environments/production/manifests/site.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp
index 39a7dba..7da41ac 100644
--- a/code/environments/production/manifests/site.pp
+++ b/code/environments/production/manifests/site.pp
@@ -264,7 +264,7 @@ class fsautoresizetab {
class ldapconf {
exec { 'add_tjener_to_ldapconf':
command => "/bin/sed -i /etc/ldap/ldap.conf -e '\$ a HOST ldap.intern\\nBASE dc=skole,dc=skolelinux,dc=no\\nTLS_REQCERT demand\\nTLS_CACERT /etc/ssl/certs/debian-edu-server.crt\\n'",
- unless => [ "/bin/grep -E 'HOST ldap.intern' /etc/ldap/ldap.conf" ],
+ unless => [ "/bin/grep -E 'HOST (tjener|ldap).intern' /etc/ldap/ldap.conf" ],
}
}