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 7dc5f73ff9db02cebbaa2811fcf8a513d9df0f3d..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,17 +69,39 @@ 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' {
                site::aptrepo { 'security':
-                       template => 'debian-org/etc/apt/sources.list.d/security.list.erb',
+                       url        => 'http://security.debian.org/',
+                       suite      => "${::lsbdistcodename}/updates",
+                       components => ['main','contrib','non-free']
                }
+
                site::aptrepo { 'backports.debian.org':
-                       template => 'debian-org/etc/apt/sources.list.d/backports.debian.org.list.erb',
+                       url        => 'http://backports.debian.org/debian-backports/',
+                       suite      => "${::lsbdistcodename}-backports",
+                       components => ['main','contrib','non-free']
                }
+
                site::aptrepo { 'volatile':
-                       template => 'debian-org/etc/apt/sources.list.d/volatile.list.erb',
+                       url        => 'http://ftp.debian.org/debian',
+                       suite      => "${::lsbdistcodename}-updates",
+                       components => ['main','contrib','non-free']
                }
        }
        site::aptrepo { 'backports.org':
@@ -94,8 +115,10 @@ class debian-org {
        }
 
        site::aptrepo { 'db.debian.org':
-               template => 'debian-org/etc/apt/sources.list.d/debian.org.list.erb',
-               key      => 'puppet:///modules/debian-org/db.debian.org.asc',
+               url        => 'http://db.debian.org/debian-admin',
+               suite      => 'lenny',
+               components => 'main',
+               key        => 'puppet:///modules/debian-org/db.debian.org.asc',
        }
 
        file { '/etc/facter':
@@ -132,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',
@@ -158,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',
@@ -187,6 +205,7 @@ class debian-org {
        mailalias { 'samhain-reports':
                ensure => present,
                recipient => $debianadmin,
+               require => Package['debian.org']
        }
 
        exec { 'apt-get update':