X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=7c9aa8590ce161f4888b000e7f2c0036c05a9435;hb=a3f77c5f83d6adeea94753360c26da037a83583d;hp=aaada6438657f3c20904820f77568ecbaf1c9b1f;hpb=bf944940ea5403b79bb6aa927c108ec3429082dc;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index aaada6438..7c9aa8590 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -33,6 +33,10 @@ class roles {
 		include porterbox
 	}
 
+	if has_role('archive_master') {
+		include archive_master
+	}
+
 	if has_role('bugs_mirror') {
 		include roles::bugs_mirror
 	}
@@ -45,6 +49,7 @@ class roles {
 	if has_role('bugs_master') {
 		ssl::service { 'bugs-master.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -59,14 +64,20 @@ class roles {
 		}
 	}
 
+	if has_role('manpages') {
+		ssl::service { 'manpages.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
 	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
 		include roles::security_mirror
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
-		include roles::www_mirror
+	if has_role('mirror_debug') {
+		include roles::debug_mirror
 	}
 
 	if has_role('ftp.d.o') {
@@ -100,6 +111,13 @@ class roles {
 		include roles::www_master
 	}
 
+	if has_role('cgi.d.o') {
+		ssl::service { 'cgi.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
 	if has_role('keyring') {
 		include roles::keyring
 	}
@@ -186,10 +204,6 @@ class roles {
 		include roles::buildd_master
 	}
 
-	if has_role('buildd_ports_master') {
-		include roles::buildd_ports_master
-	}
-
 	if has_role('piuparts') {
 		include roles::piuparts
 	}
@@ -232,6 +246,7 @@ class roles {
 	if has_role('packages') {
 		ssl::service { 'packages.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -276,4 +291,51 @@ class roles {
 			notify => Service['apache2'],
 		}
 	}
+
+	if has_role('httpredir') {
+		include roles::httpredir
+	}
+
+	if has_role('debtags') {
+		include roles::debtags
+	}
+
+	if has_role('planet_search') {
+		ssl::service { 'planet-search.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('i18n.d.o') {
+		ssl::service { 'i18n.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('l10n.d.o') {
+		ssl::service { 'l10n.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('dedup.d.n') {
+		ssl::service { 'dedup.debian.net':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	if has_role('pet.d.n') {
+		ssl::service { 'pet.debian.net':
+			notify => Service['apache2'],
+			key => true,
+		}
+		ssl::service { 'pet-devel.debian.net':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
 }