X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=04db264f5a5528a0fe26d7bc39b9a2ec64077d03;hb=def5cc4e6d4d2409d32f9eca4281d7a15a105843;hp=8c76900209ecb9c0ceb804e0929eb4ead90687a3;hpb=9573712862a431d238cf67894f4b422794eaa78f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 8c7690020..04db264f5 100644
--- 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' {
@@ -85,10 +98,18 @@ class debian-org {
 			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':
@@ -108,6 +129,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,
@@ -141,8 +170,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',
@@ -168,11 +201,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',
@@ -197,6 +225,7 @@ class debian-org {
 	mailalias { 'samhain-reports':
 		ensure => present,
 		recipient => $debianadmin,
+		require => Package['debian.org']
 	}
 
 	exec { 'apt-get update':