Load named::geodns from roles/manifests/init.pp based on hiera instead of from site...

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 43dec32..51f9be5 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
@@ -43,8 +39,13 @@ class roles {
                        notify  => Exec['service apache2 reload'],
                        key => true,
                }
+               @ferm::rule { 'dsa-bugs-abusers':
+                       prio    => "005",
+                       rule    => "saddr (220.243.135/24 220.243.136/24) DROP",
+               }
        }
        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, }
        }
 
@@ -70,9 +71,6 @@ class roles {
        if has_role('debian_mirror') {
                include roles::debian_mirror
        }
-       if has_role('ftp.d.o') {
-               include roles::ftp
-       }
        if has_role('ftp_master') {
                include roles::ftp_master
                include roles::dakmaster
@@ -99,6 +97,7 @@ class roles {
                include roles::security_master
                include roles::dakmaster
        }
+
        if has_role('security_mirror') {
                include roles::security_mirror
        }
@@ -162,6 +161,10 @@ class roles {
                include named::primary
        }
 
+       if has_role('dns_geo') {
+               include named::geodns
+       }
+
        if has_role('weblog_destination') {
                include roles::weblog_destination
        }
@@ -279,10 +282,18 @@ class roles {
                include roles::dgit_git
        }
 
-       if $::hostname in [lw01, lw02, lw03, lw04] {
+       if $::hostname in [lw01, lw02, lw03, lw04, lw09, lw10] {
                include roles::snapshot
        }
 
+       if has_role('snapshot_web') {
+               include roles::snapshot_web
+       }
+
+       if has_role('snapshot_shell') {
+               include roles::snapshot_shell
+       }
+
        if has_role('veyepar.debian.org') {
                ssl::service { 'veyepar.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
@@ -294,6 +305,9 @@ class roles {
                include roles::debtags
        }
 
+       if has_role('planet_master') {
+               include roles::planet_master
+       }
        if has_role('planet_search') {
                ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
        }
@@ -353,4 +367,32 @@ class roles {
        if $::keyring_debian_org_mirror {
                include roles::keyring_debian_org_mirror
        }
+
+       if has_role('popcon') {
+               include roles::popcon
+       }
+
+       if has_role('debsources') {
+               include roles::debsources
+       }
+
+       if has_role('ipsec') {
+               include ipsec
+       }
+
+       if has_role('debconf_wafer') {
+               include roles::debconf_wafer
+       }
+
+       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
+       }
+
 }