X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=efde596cb7369fee569e02249e7e21a21d2ff6d9;hb=4050864b78a0820698589e994b16d6fa2252b147;hp=43dec328389f1ac3d6254aedaaad3c006fb08f0e;hpb=bd35714fff1db0ae3901ea95e82a8f603130bcae;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 43dec3283..efde596cb 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -71,7 +71,10 @@ class roles {
 		include roles::debian_mirror
 	}
 	if has_role('ftp.d.o') {
-		include roles::ftp
+		vsftpd::site { 'ftp':
+			ensure	=> absent,
+			root	=> '/nonexistent',
+		}
 	}
 	if has_role('ftp_master') {
 		include roles::ftp_master
@@ -99,6 +102,8 @@ 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
 	}
@@ -294,6 +299,9 @@ class roles {
 		include roles::debtags
 	}
 
+	if has_role('planet_master') {
+		include roles::planet_master
+	}
 	if has_role('planet_search') {
 		ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -353,4 +361,20 @@ class roles {
 	if $::keyring_debian_org_mirror {
 		include roles::keyring_debian_org_mirror
 	}
+
+	if has_role('popcon') {
+		include roles::popcon
+	}
+
+	if has_role('debsources') {
+		include roles::debsources
+	}
+
+	if has_role('ipsec') {
+		include ipsec
+	}
+
+	if has_role('debconf_wafer') {
+		include roles::debconf_wafer
+	}
 }