X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=5f106c3896f75365732e4376fd5396ecc759b2fd;hb=b1b343629e60e93500d63bcf87038d42b262cc98;hp=f16846cfaf0e6aa69b723d2f15160e4e493f2725;hpb=729e6d78e4d1171c0bf9523e314376510446f56b;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index f16846cfa..5f106c389 100644 --- 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,8 @@ class roles { if has_role('release') { include roles::release } + + if has_role('rtc') { + include roles::rtc + } }