From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 8 Sep 2019 06:43:23 +0000 (+0200)
Subject: Revert "want systemd-timesyncd from multi-user.target"
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=79bd42de3ee78f430fc810e08a5c40f1eeb46a04;p=mirror%2Fdsa-puppet.git

Revert "want systemd-timesyncd from multi-user.target"

This reverts commit 443aa81b256b615c55d4fe987a556c663ad4589d.

By default, systemd-timesyncd.service is installed/wanted-by
sysinit.target.  We changed that to multi-user.target about three
years ago, but it's not clear why we did that.

Revert to the defaults and see if it blows up.  If yes, we have a chance
to find out exactly why we moved it.  If not, we have one less thing
that gets messed with at every point release.
---

diff --git a/modules/systemdtimesyncd/manifests/init.pp b/modules/systemdtimesyncd/manifests/init.pp
index bc8fe5f74..6a9a298a5 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':