X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=24821537fda65d330e69610e88d60760ade7183d;hb=40676ab4e5a91665f557f34f944bae430f9b4eb0;hp=5f843acfd0b6c36b8c18a3bf1d072d5ae48ab2bb;hpb=43027472aba9b781f311863d36fc8cbdcb882479;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5f843acfd..24821537f 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
@@ -294,6 +297,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, }
 	}
@@ -361,4 +367,12 @@ class roles {
 	if has_role('debsources') {
 		include roles::debsources
 	}
+
+	if has_role('ipsec') {
+		include ipsec
+	}
+
+	if has_role('debconf_wafer') {
+		include roles::debconf_wafer
+	}
 }