X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=1b67879b6ddfc2cd5d0f89bcf1d51a139b3f50f2;hb=c54d3c0937444eb08707008c85d9e8734448c135;hp=c0b46e2d8e0c15c6537837eed3b9b19e63932a1e;hpb=deeab74647d436893c5bf0833e8f2314643d7c17;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index c0b46e2d8..1b67879b6 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,18 @@ class roles {
 		}
 	}
 
-	# XXX: turn this into a real role
-	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
-		include roles::security_mirror
+	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_www_mirror') {
-		include roles::www_mirror
+	if has_role('security_mirror') {
+		include roles::security_mirror
+	}
+	if has_role('debug_mirror') {
+		include roles::debug_mirror
 	}
 
 	if has_role('ftp.d.o') {
@@ -88,6 +97,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -100,6 +110,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 +203,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
 	}
@@ -210,6 +223,10 @@ class roles {
 		include roles::rtc
 	}
 
+	if has_role('jenkins') {
+		include roles::jenkins
+	}
+
 	if has_role('keystone') {
 		include roles::keystone
 	}
@@ -228,24 +245,29 @@ class roles {
 	if has_role('packages') {
 		ssl::service { 'packages.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
 	if has_role('qamaster') {
 		ssl::service { 'qa.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
 	if has_role('packagesqamaster') {
 		ssl::service { 'packages.qa.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
 	if has_role('gobby_debian_org') {
 		ssl::service { 'gobby.debian.org':
 			notify => Service['apache2'],
+			key => true,
+			tlsaport => [443, 6523],
 		}
 	}
 
@@ -266,4 +288,76 @@ class roles {
 	if $::hostname in [lw01, lw02, lw03, lw04] {
 		include snapshot
 	}
+
+	if has_role('veyepar.debian.org') {
+		ssl::service { 'veyepar.debian.org':
+			notify => Service['apache2'],
+			key => true,
+		}
+	}
+
+	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,
+		}
+	}
+
+	if has_role('ports-master') {
+		include roles::ports-master
+	}
+	if has_role('ports_mirror') {
+		include roles::ports_mirror
+	}
+
+	if $::hostname in [klecker] {
+		onion::service { 'ftp.debian.org':
+			port => 80,
+			target_address => '130.89.148.12',
+			target_port => 81,
+		}
+	}
+	if has_role('onionbalance') {
+		include roles::onionbalance
+	}
 }