X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsystemdtimesyncd%2Fmanifests%2Finit.pp;h=a0d5b1224557fe1c33678bc4a48fa7406d97fd65;hb=a063f9b393a7f664766e1e70b63b8a3cad3be9db;hp=bc8fe5f74a5a61ab688578ef333c349cae6eb09c;hpb=443aa81b256b615c55d4fe987a556c663ad4589d;p=mirror%2Fdsa-puppet.git

diff --git a/modules/systemdtimesyncd/manifests/init.pp b/modules/systemdtimesyncd/manifests/init.pp
index bc8fe5f74..a0d5b1224 100644
--- a/modules/systemdtimesyncd/manifests/init.pp
+++ b/modules/systemdtimesyncd/manifests/init.pp
@@ -7,16 +7,9 @@ class systemdtimesyncd {
 		fail ( "No local timeservers configured for systemdtimesyncd." )
 	} else {
 		file { '/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service':
-			ensure => 'absent',
-			notify => Exec['systemctl daemon-reload'],
-		}
-		file { '/etc/systemd/system/multi-user.target.wants':
-			ensure => 'directory',
-		}
-		file { '/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service':
-			ensure => 'link',
-			target => '/lib/systemd/system/systemd-timesyncd.service',
-			notify => Exec['systemctl daemon-reload'],
+				ensure => 'link',
+				target => '/lib/systemd/system/systemd-timesyncd.service',
+				notify => Exec['systemctl daemon-reload'],
 		}
 
 		service { 'systemd-timesyncd':
@@ -27,5 +20,13 @@ class systemdtimesyncd {
 			content => template('systemdtimesyncd/timesyncd.conf.erb'),
 			notify  => Service['systemd-timesyncd'],
 		}
+
+		# Up until 2019-09 we had timesyncd started by multi-user.target instead of the default
+		# sysinit.target.wants.  We are moving back to sysinit.target.wants (for now).
+		file { '/etc/systemd/system/multi-user.target.wants/systemd-timesyncd.service':
+			ensure => 'absent',
+			notify => Exec['systemctl daemon-reload'],
+		}
+
 	}
 }