move pg full backups to pull model

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index f16846cfaf0e6aa69b723d2f15160e4e493f2725..0a5da93ff2d460d048793a2219f6757f728a461e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -8,7 +8,7 @@ class roles {
                include munin::master
        }
 
-       if getfromhash($site::nodeinfo, 'nagiosmaster') {
+       if has_role('nagiosmaster') {
        #       include nagios::server
                ssl::service { 'nagios.debian.org':
                        notify => Service['apache2'],
@@ -20,7 +20,8 @@ class roles {
                include buildd
        }
 
-       if has_role('porterbox') {
+       # XXX: turn this into a real role
+       if getfromhash($site::nodeinfo, 'porterbox') {
                include porterbox
        }
 
@@ -28,16 +29,24 @@ class roles {
                include roles::bugs_mirror
        }
 
+       if has_role('bugs_base') {
+               ssl::service { 'bugs.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
        if has_role('ftp_master') {
                include roles::ftp_master
                include roles::dakmaster
        }
 
-       if has_role('apache2_security_mirror') {
+       # XXX: turn this into a real role
+       if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
                include roles::security_mirror
        }
 
-       if has_role('apache2_www_mirror') {
+       # XXX: turn this into a real role
+       if getfromhash($site::nodeinfo, 'apache2_www_mirror') {
                include roles::www_mirror
        }
 
@@ -127,6 +136,10 @@ class roles {
                include roles::udd
        }
 
+       if has_role('sso') {
+               include roles::sso
+       }
+
        if has_role('buildd_master') {
                include roles::buildd_master
        }
@@ -146,4 +159,12 @@ class roles {
        if has_role('release') {
                include roles::release
        }
+
+       if has_role('rtc') {
+               include roles::rtc
+       }
+
+       if has_role('postgres_backup_server') {
+               include postgres::backup_server
+       }
 }