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 d224a6bcc31431bf04dcda45b2e76aee21386ef8..33ab60456636965f8c88d5eff3c2392a40fafa9c 100644 (file)
--- 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 47a0dd79d674bad3629ec8dad52737599e6f1b37..c7c827874c4a318334a25dda057a1e63932131f1 100644 (file)
--- 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