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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2a2bb4932..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,6 +96,7 @@ class roles {
 		include roles::security_master
 		include roles::dakmaster
 	}
+
 	if has_role('security_mirror') {
 		include roles::security_mirror
 	}
@@ -282,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
 	}
 
@@ -367,4 +362,16 @@ class roles {
 	if has_role('debsources') {
 		include roles::debsources
 	}
+
+	if has_role('ipsec') {
+		include ipsec
+	}
+
+	if has_role('debconf_wafer') {
+		include roles::debconf_wafer
+	}
+
+	if has_role('cdbuilder_local_mirror') {
+		include roles::cdbuilder_local_mirror
+	}
 }