X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=5efac975e1a016062f8ba51b6005f17a24ecfc7b;hb=8d9666e63a8876fa5e85964fe5c1de8d849a9fe3;hp=4683023c26d944bdd9b7afb718e4224dfd9f8731;hpb=1797dccbca583a7f60fd38e0907af0775ac61364;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4683023c2..5efac975e 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
 	}
@@ -60,19 +64,24 @@ 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 getfromhash($site::nodeinfo, 'apache2_security_mirror') {
+		include roles::security_mirror
 	}
 
 	if has_role('mirror_debug') {
 		include roles::debug_mirror
 	}
+	if has_role('mirror_ports') {
+		include roles::ports_mirror
+	}
 
 	if has_role('ftp.d.o') {
 		include roles::ftp
@@ -93,6 +102,7 @@ class roles {
 	if has_role('people') {
 		ssl::service { 'people.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -240,24 +250,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],
 		}
 	}
 
@@ -282,6 +297,7 @@ class roles {
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org':
 			notify => Service['apache2'],
+			key => true,
 		}
 	}
 
@@ -331,4 +347,19 @@ class roles {
 			key => true,
 		}
 	}
+
+	if has_role('ports-master') {
+		include roles::ports-master
+	}
+
+	if $::hostname in [klecker] {
+		onion::service { 'ftp.debian.org':
+			port => 80,
+			target_address => '130.89.148.12',
+			target_port => 81,
+		}
+	}
+	if $::hostname in [olin] {
+		onion::balance_service { 'ftp.debian.org': }
+	}
 }