X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=e5c8e3ad5235cec958bc0a9d688081bd2ea1bae2;hb=eb75e4c9f48bb7bd2208466d29895a3d82e80b50;hp=8a91339d870755ff2d5bd67727700bbc6e0793b5;hpb=594ba45a0aaf7be0ad8e74089342611fd56042f1;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8a91339d8..e5c8e3ad5 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -45,6 +45,7 @@ class roles {
 		}
 	}
 	if has_role('bugs_master') {
+		ssl::service { 'bugs-devel.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
@@ -70,12 +71,6 @@ class roles {
 	if has_role('debian_mirror') {
 		include roles::debian_mirror
 	}
-	if has_role('ftp.d.o') {
-		vsftpd::site { 'ftp':
-			ensure	=> absent,
-			root	=> '/nonexistent',
-		}
-	}
 	if has_role('ftp_master') {
 		include roles::ftp_master
 		include roles::dakmaster
@@ -102,6 +97,7 @@ class roles {
 		include roles::security_master
 		include roles::dakmaster
 	}
+
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -282,10 +278,14 @@ class roles {
 		include roles::dgit_git
 	}
 
-	if $::hostname in [lw01, lw02, lw03, lw04] {
+	if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
 		include roles::snapshot
 	}
 
+	if has_role('snapshot_web') {
+		include roles::snapshot_web
+	}
+
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -373,6 +373,14 @@ class roles {
 	}
 
 	if has_role('debconf_wafer') {
-		include debconf_wafer
+		include roles::debconf_wafer
+	}
+
+	if has_role('cdbuilder_local_mirror') {
+		include roles::cdbuilder_local_mirror
+	}
+
+	if has_role('alioth_archive') {
+		include roles::alioth_archive
 	}
 }