X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Froles%2Fmanifests%2Finit.pp;h=cab8edd978da9f7b7fe44d5246ef519e5827ce40;hb=aaa8963b91de9a3cfc1b3d1fbfe06ac822be73a6;hp=063a748e4954aa1f02540037839fce8aac96f6f1;hpb=aa94c10edc643747502e42bd5608cead4e48218f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 063a748e4..cab8edd97 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -31,14 +31,6 @@ class roles {
 	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'porterbox') {
 		include porterbox
-		class {'porterbox':
-			ensure => present,
-		}
-	} else {
-		include porterbox
-		class {'porterbox':
-			ensure => absent,
-		}
 	}
 
 	if has_role('bugs_mirror') {
@@ -61,6 +53,12 @@ class roles {
 		include roles::dakmaster
 	}
 
+	if has_role('api.ftp-master') {
+		ssl::service { 'api.ftp-master.debian.org':
+			notify => Service['apache2'],
+		}
+	}
+
 	# XXX: turn this into a real role
 	if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
 		include roles::security_mirror
@@ -156,6 +154,10 @@ class roles {
 		include roles::lists
 	}
 
+	if has_role('list_search') {
+		include roles::listsearch
+	}
+
 	if has_role('rtmaster') {
 		include roles::rtmaster
 	}
@@ -231,4 +233,11 @@ class roles {
 			tlsaport => 0,
 		}
 	}
+
+	if has_role('search_backend') {
+		include search_backend
+	}
+	if has_role('search_frontend') {
+		include search_frontend
+	}
 }