From: Tollef Fog Heen <tfheen@err.no>
Date: Thu, 27 Nov 2014 16:19:37 +0000 (+0100)
Subject: Disable puppet-as-a-service on systemd systemd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5d6d2f43b495114f97fb2640124c38d66cc85b60;hp=a887b89923ce1844ab3f85930949bc45e61c445e;p=mirror%2Fdsa-puppet.git

Disable puppet-as-a-service on systemd systemd

We run puppet from cron.  Mask the service so it's never started.
---

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index d224a6bcc..33ab60456 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -236,6 +236,16 @@ class debian-org {
 	file { '/etc/default/puppet':
 		source => 'puppet:///modules/debian-org/puppet.default',
 	}
+	file { '/etc/systemd/system':
+		ensure  => directory,
+		recurse => true,
+	}
+        file { '/etc/systemd/system/puppet-service':
+		ensure => 'link',
+		target => '/dev/null',
+		notify => Exec['systemctl daemon-reload'],
+	}
+
 	file { '/etc/cron.d/dsa-puppet-stuff':
 		source  => 'puppet:///modules/debian-org/dsa-puppet-stuff.cron',
 		require => Package['debian.org'],
@@ -319,6 +329,11 @@ class debian-org {
 		refreshonly => true
 	}
 
+	exec { 'systemctl daemon-reload':
+		refreshonly => true,
+		onlyif  => "test -x /bin/systemctl"
+	}
+
 	tidy { '/var/lib/puppet/clientbucket/':
 		age      => '2w',
 		recurse  => 9,
diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 47a0dd79d..c7c827874 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -368,6 +368,7 @@ file=/etc/apt/apt.conf.d/local-compression
 file=/etc/apt/apt.conf.d/local-recommends
 file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/apt/preferences.d/buildd
+file=/etc/systemd/system/puppet.service
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey