start using nagios::server again, move cert setup there

[mirror/dsa-puppet.git] / modules / roles / manifests / init.pp

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index f930906..e6d6d06 100644 (file)
--- 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
@@ -282,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, }
        }
@@ -379,4 +379,14 @@ class roles {
        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 }
+       }
 }