X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=2172cd2afde5a31033db7515dcdece0808d206d1;hb=ed9b9d117211509e0492eada8a730f5a82dc391c;hp=efde596cb7369fee569e02249e7e21a21d2ff6d9;hpb=e4ee8dd6f2f41e0ac26910d2b08978cd65a51ed7;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index efde596cb..2172cd2af 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -70,12 +70,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,8 +96,7 @@ class roles {
 		include roles::security_master
 		include roles::dakmaster
 	}
-	$zz = has_role('security_mirror')
-	notice("Has security mirror role? '${zz}'")
+
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -284,7 +277,7 @@ 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
 	}
 
@@ -377,4 +370,8 @@ class roles {
 	if has_role('debconf_wafer') {
 		include roles::debconf_wafer
 	}
+
+	if has_role('cdbuilder_local_mirror') {
+		include roles::cdbuilder_local_mirror
+	}
 }