Move all related exec statements into class ldapservercert_renewal.

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 {