X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=5258dfbe6b54aa6e365806d432a77886d6405a77;hb=3d0358a63f806461cdf786cbcc6b34b0ee23d681;hp=f7f278fbf82a5ea857aa7d0f12a4f85a2a7f6f65;hpb=5f60bc1940146f4befbfc8932de8285c1c3a73f5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index f7f278fbf..5258dfbe6 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -13,23 +13,30 @@ class debian-org {
 			'sysklogd',
 			'rsyslog',
 		]:
-			ensure => purged,
+		ensure => purged,
+	}
+	package { [
+			'debian.org',
+			'dsa-munin-plugins',
+		]:
+		ensure => installed,
+		require => [
+			File['/etc/apt/sources.list.d/db.debian.org.list'],
+			Exec['apt-get update']
+		]
 	}
 	package { [
 			'apt-utils',
 			'bash-completion',
-			'debian.org',
 			'dnsutils',
-			'dsa-munin-plugins',
 			'less',
 			'lsb-release',
 			'libfilesystem-ruby1.8',
-			'molly-guard',
 			'mtr-tiny',
 			'nload',
 			'pciutils',
 		]:
-			ensure => installed,
+		ensure => installed,
 	}
 
 	munin::check { [
@@ -54,21 +61,47 @@ class debian-org {
 
 	if getfromhash($site::nodeinfo, 'broken-rtc') {
 		package { 'fake-hwclock':
-			ensure => installed
+			ensure => installed,
+			require => [
+				File['/etc/apt/sources.list.d/db.debian.org.list'],
+				Exec['apt-get update']
+			]
 		}
 	}
 
+	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':
@@ -82,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':
@@ -120,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',
@@ -146,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',
@@ -175,12 +205,13 @@ class debian-org {
 	mailalias { 'samhain-reports':
 		ensure => present,
 		recipient => $debianadmin,
+		require => Package['debian.org']
 	}
 
 	exec { 'apt-get update':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
 		refreshonly => true,
-	}-> Package <| |>
+	}
 
 	exec { 'dpkg-reconfigure tzdata -pcritical -fnoninteractive':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',