diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-06 16:08:44 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-06 16:08:44 +0200 |
| commit | dedf46c3ca4cf4e3080f06719d12ff757e619cbc (patch) | |
| tree | 0a8af750a7b3f03da5ae608284314767d402ddf8 | |
| parent | 88837cbf5e99aecd73953e6594ca3345fa65c0f0 (diff) | |
| download | puppet.KATH-dedf46c3ca4cf4e3080f06719d12ff757e619cbc.tar.gz puppet.KATH-dedf46c3ca4cf4e3080f06719d12ff757e619cbc.tar.bz2 puppet.KATH-dedf46c3ca4cf4e3080f06719d12ff757e619cbc.zip | |
Move all related exec statements into class ldapservercert_renewal.
| -rw-r--r-- | code/environments/production/manifests/site.pp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/code/environments/production/manifests/site.pp b/code/environments/production/manifests/site.pp index 9f4bacf..64845ae 100644 --- a/code/environments/production/manifests/site.pp +++ b/code/environments/production/manifests/site.pp @@ -133,24 +133,24 @@ class ldapservercert_renewal { command => "/usr/bin/test /etc/ldap/ssl/ldap-server-pubkey.pem -ot /etc/debian-edu/itzks.buster-rollout-date", onlyif => ["/usr/bin/test ! -e /etc/debian-edu/itzks.buster-rollout-date", "/usr/bin/touch -t 201907021800.00 /etc/debian-edu/itzks.buster-rollout-date", "/usr/bin/test -e /etc/ldap/ssl/ldap-server-pubkey.pem" ], } -} -exec { 'ensure_ldapservercert_prebuster_removed': - command => "/usr/bin/find /etc/ldap/ssl/ldap-server-pubkey.pem -type f -not -newermt \"2019-07-02 18:00:00\" -delete", - subscribe => Exec['ldapservercert_age_test'], - refreshonly => true, -} + exec { 'ensure_ldapservercert_prebuster_removed': + command => "/usr/bin/find /etc/ldap/ssl/ldap-server-pubkey.pem -type f -not -newermt \"2019-07-02 18:00:00\" -delete", + subscribe => Exec['ldapservercert_age_test'], + refreshonly => true, + } -exec { 'ensure_ldapservercert_renewed': - command => "/bin/systemctl restart fetch-ldap-cert", - subscribe => Exec['ensure_ldapservercert_prebuster_removed'], - refreshonly => true, -} + exec { 'ensure_ldapservercert_renewed': + command => "/bin/systemctl restart fetch-ldap-cert", + subscribe => Exec['ensure_ldapservercert_prebuster_removed'], + refreshonly => true, + } -exec { 'ldapservercert_renewal_restart_nslcd': - command => "/bin/systemctl restart nslcd", - subscribe => Exec['ensure_ldapservercert_renewed'], - refreshonly => true, + exec { 'ldapservercert_renewal_restart_nslcd': + command => "/bin/systemctl restart nslcd", + subscribe => Exec['ensure_ldapservercert_renewed'], + refreshonly => true, + } } class itzks_systems_common { |