X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=5258dfbe6b54aa6e365806d432a77886d6405a77;hb=3d0358a63f806461cdf786cbcc6b34b0ee23d681;hp=3d2fd217cbeb9b7c06953e482ab9439299c7a5c9;hpb=2c8889fb72d9bfcc3cff5de485c927d64e7f78ed;p=mirror%2Fdsa-puppet.git diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp index 3d2fd217c..5258dfbe6 100644 --- a/modules/debian-org/manifests/init.pp +++ b/modules/debian-org/manifests/init.pp @@ -69,7 +69,6 @@ class debian-org { } } - package { 'molly-guard': ensure => installed, } @@ -156,7 +155,7 @@ class debian-org { notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'], } file { '/etc/puppet/puppet.conf': - source => 'puppet:///modules/debian-org/puppet.conf', + content => template('debian-org/puppet.conf.erb'), } file { '/etc/default/puppet': source => 'puppet:///modules/debian-org/puppet.default',