puppet.conf reorg

[dsa-puppet.git] / modules / debian-org / manifests / init.pp

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index f0b70e43a5c7ae057ab7555eefb28db91e2e2bec..5258dfbe6b54aa6e365806d432a77886d6405a77 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -32,7 +32,6 @@ class debian-org {
                        'less',
                        'lsb-release',
                        'libfilesystem-ruby1.8',
-                       'molly-guard',
                        'mtr-tiny',
                        'nload',
                        'pciutils',
@@ -70,6 +69,20 @@ class debian-org {
                }
        }
 
+       package { 'molly-guard':
+               ensure => installed,
+       }
+       file { '/etc/molly-guard/run.d/10-check-kvm':
+               mode    => '0755',
+               source  => 'puppet:///modules/debian-org/molly-guard/10-check-kvm',
+               require => Package['molly-guard'],
+       }
+       file { '/etc/molly-guard/run.d/15-acquire-reboot-lock':
+               mode    => '0755',
+               source  => 'puppet:///modules/debian-org/molly-guard/15-acquire-reboot-lock',
+               require => Package['molly-guard'],
+       }
+
        # This really means 'not wheezy'
 
        if $::debarchitecture != 'armhf' {
@@ -142,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',
@@ -168,11 +181,6 @@ class debian-org {
                source => 'puppet:///modules/debian-org/rc.local',
                notify => Exec['rc.local start'],
        }
-       file { '/etc/molly-guard/run.d/15-acquire-reboot-lock':
-               mode    => '0755',
-               source  => 'puppet:///modules/debian-org/molly-guard-acquire-reboot-lock',
-               require => Package['molly-guard'],
-       }
        file { '/etc/dsa':
                ensure => directory,
                mode   => '0755',