X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=ead009c093b748f03c33d3adab43559269d39d69;hb=1ab297e177f78afa9ae4ff44ba3110fbec30beee;hp=67675efc07f14ec4fa6f5d3e6d406f811d8dedd3;hpb=4afbb6552d3b4c54230f07fa57c4c781b3b9a9d7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 67675efc0..ead009c09 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,6 +71,9 @@ class roles {
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
+	if has_role('historical_mirror') {
+		include roles::historical_mirror
+	}
 	if has_role('debian_mirror') {
 		include roles::debian_mirror
 	}
@@ -303,14 +306,23 @@ class roles {
 		ssl::service { 'pet-devel.debian.net': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
-	if has_role('ports-master') {
-		include roles::ports-master
+	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 onion::balance
 	}
+	if has_role('bgp') {
+		include roles::bgp
+	}
+	if has_role('cdimage-search') {
+		include roles::cdimage_search
+	}
 }