X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Fmanifests%2Finit.pp;h=d5d973d372d095cfae130358326d22490a25af33;hb=1b96a97126a312668c4d50a3909d1f668542de71;hp=a12ce2d91d7c76f34b5726d9c983d4f14bb1d0c9;hpb=1e341bf93cda9564ae029683e2e534182ba484a2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index a12ce2d91..d5d973d37 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -83,25 +83,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':
@@ -121,6 +127,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,