X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=3f57de2ebaa006c701e19e5b3de91a1922d8eb99;hb=579eae954fe353be65869f1b91b116e1c460efad;hp=c3488e503c0dbb233cfd5d58b2a91d2a5a358371;hpb=382b96856d6c214d79ae17d7f3b919ed7ae99bf8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index c3488e503..3f57de2eb 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -13,14 +13,22 @@ 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',
@@ -29,7 +37,7 @@ class debian-org {
 			'nload',
 			'pciutils',
 		]:
-			ensure => installed,
+		ensure => installed,
 	}
 
 	munin::check { [
@@ -54,7 +62,11 @@ 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']
+			]
 		}
 	}
 
@@ -62,13 +74,21 @@ class debian-org {
 
 	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 +102,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':
@@ -175,11 +197,11 @@ class debian-org {
 	mailalias { 'samhain-reports':
 		ensure => present,
 		recipient => $debianadmin,
+		onlyif  => "test -e /etc/aliases",
 	}
 
 	exec { 'apt-get update':
 		path        => '/usr/bin:/usr/sbin:/bin:/sbin',
-		stage       => setup_infra,
 		refreshonly => true,
 	}