X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=ad592d77771b6887e2ad9c6faf8baaf31f67eb9a;hb=d2f41d6cc64287591ac5c97a1fae9adb4f848d36;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..ad592d777 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -39,6 +39,12 @@ class debian-org {
 		ensure => installed,
 	}
 
+	if $::lsbmajdistrelease >= 7 {
+		package { 'libfilesystem-ruby1.9':
+			ensure => installed,
+		}
+	}
+
 	munin::check { [
 			'cpu',
 			'entropy',
@@ -69,7 +75,6 @@ class debian-org {
 		}
 	}
 
-
 	package { 'molly-guard':
 		ensure => installed,
 	}
@@ -84,25 +89,31 @@ class debian-org {
 		require => Package['molly-guard'],
 	}
 
-	# This really means 'not wheezy'
-
-	if $::debarchitecture != 'armhf' {
-		site::aptrepo { 'security':
-			url        => 'http://security.debian.org/',
-			suite      => "${::lsbdistcodename}/updates",
-			components => ['main','contrib','non-free']
-		}
+	site::aptrepo { 'security':
+		url        => 'http://security.debian.org/',
+		suite      => "${::lsbdistcodename}/updates",
+		components => ['main','contrib','non-free']
+	}
 
+	if $::lsbdistcodename != 'wheezy' {
 		site::aptrepo { 'backports.debian.org':
 			url        => 'http://backports.debian.org/debian-backports/',
 			suite      => "${::lsbdistcodename}-backports",
 			components => ['main','contrib','non-free']
 		}
 
-		site::aptrepo { 'volatile':
-			url        => 'http://ftp.debian.org/debian',
-			suite      => "${::lsbdistcodename}-updates",
-			components => ['main','contrib','non-free']
+		if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
+			site::aptrepo { 'volatile':
+				url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
+				suite      => "${::lsbdistcodename}-updates",
+				components => ['main','contrib','non-free']
+			}
+		} else {
+			site::aptrepo { 'volatile':
+				url        => 'http://ftp.debian.org/debian',
+				suite      => "${::lsbdistcodename}-updates",
+				components => ['main','contrib','non-free']
+			}
 		}
 	}
 	site::aptrepo { 'backports.org':
@@ -122,6 +133,14 @@ class debian-org {
 		key        => 'puppet:///modules/debian-org/db.debian.org.asc',
 	}
 
+	if getfromhash($site::nodeinfo, 'hoster', 'mirror-debian') {
+		site::aptrepo { 'debian':
+			url        => getfromhash($site::nodeinfo, 'hoster', 'mirror-debian'),
+			suite      => $::lsbdistcodename,
+			components => ['main','contrib','non-free']
+		}
+	}
+
 	file { '/etc/facter':
 		ensure  => directory,
 		purge   => true,
@@ -155,8 +174,12 @@ class debian-org {
 		source => 'puppet:///modules/debian-org/timezone',
 		notify => Exec['dpkg-reconfigure tzdata -pcritical -fnoninteractive'],
 	}
+	if $::hostname == handel {
+		include puppetmaster::db
+		$dbpassword = $puppetmaster::db::password
+	}
 	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',