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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 2172cd2af..e6d6d0643 100644
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -17,11 +17,7 @@ class roles {
 	}
 
 	if has_role('nagiosmaster') {
-	#	include nagios::server
-		ssl::service { 'nagios.debian.org':
-			notify  => Exec['service apache2 reload'],
-			key => true,
-		}
+		include nagios::server
 	}
 
 	# XXX: turn this into a real role
@@ -45,6 +41,7 @@ class roles {
 		}
 	}
 	if has_role('bugs_master') {
+		ssl::service { 'bugs-devel.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 		ssl::service { 'bugs-master.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
 
@@ -281,6 +278,10 @@ class roles {
 		include roles::snapshot
 	}
 
+	if has_role('snapshot_web') {
+		include roles::snapshot_web
+	}
+
 	if has_role('veyepar.debian.org') {
 		ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
 	}
@@ -374,4 +375,18 @@ class roles {
 	if has_role('cdbuilder_local_mirror') {
 		include roles::cdbuilder_local_mirror
 	}
+
+	if has_role('alioth_archive') {
+		include roles::alioth_archive
+	}
+	if has_role('anonscm') {
+		include roles::anonscm
+	}
+
+	if has_role('kanboard') {
+		include apache2
+		package {'php-gd': ensure => installed }
+		package {'php-pgsql': ensure => installed }
+		package {'libapache2-mod-php': ensure => installed }
+	}
 }