no hosts (directly) in roles::archvsync_base

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 8bc6aa5..0a3e136 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -7,11 +7,6 @@
 #   include roles
 #
 class roles {
-
-       if has_role('puppetmaster') {
-               include puppetmaster
-       }
-
        if has_role('muninmaster') {
                include munin::master
        }
@@ -20,16 +15,6 @@ class roles {
                include nagios::server
        }
 
-       # XXX: turn this into a real role
-       if getfromhash($site::nodeinfo, 'buildd') {
-               include buildd
-       }
-
-       # XXX: turn this into a real role
-       if getfromhash($site::nodeinfo, 'porterbox') {
-               include porterbox
-       }
-
        if has_role('bugs_mirror') {
                include roles::bugs_mirror
        }
@@ -39,7 +24,7 @@ class roles {
                        notify  => Exec['service apache2 reload'],
                        key => true,
                }
-               @ferm::rule { 'dsa-bugs-abusers':
+               ferm::rule { 'dsa-bugs-abusers':
                        prio    => "005",
                        rule    => "saddr (220.243.135/24 220.243.136/24) DROP",
                }
@@ -53,10 +38,6 @@ class roles {
                include roles::manpages_dyn
        }
 
-       if has_role('archvsync_base_additional') {
-               include archvsync_base
-       }
-
        # archive.debian.org
        if has_role('historical_mirror') {
                include roles::historical_mirror
@@ -131,16 +112,6 @@ class roles {
                include roles::syncproxy
        }
 
-       if has_role('static_master') {
-               include roles::static_master
-       }
-
-       if has_role('static_mirror') {
-               include roles::static_mirror
-       } elsif has_role('static_source') {
-               include roles::static_source
-       }
-
        if has_role('weblog_provider') {
                include roles::weblog_provider
        }
@@ -158,11 +129,11 @@ class roles {
        }
 
        if has_role('dns_primary') {
-               include named::primary
+               include roles::dns_primary
        }
 
        if has_role('dns_geo') {
-               include named::geodns
+               include roles::dns_geodns
        }
 
        if has_role('weblog_destination') {
@@ -201,10 +172,6 @@ class roles {
                include roles::tracker
        }
 
-       if has_role('buildd_master') {
-               include roles::buildd_master
-       }
-
        if has_role('piuparts') {
                include roles::piuparts
        }
@@ -224,10 +191,6 @@ class roles {
                include roles::rtc
        }
 
-       if has_role('jenkins') {
-               include roles::jenkins
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }
@@ -376,10 +339,6 @@ class roles {
                include roles::debsources
        }
 
-       if has_role('ipsec') {
-               include ipsec
-       }
-
        if has_role('debconf_wafer') {
                include roles::debconf_wafer
        }
@@ -388,11 +347,7 @@ class roles {
                include roles::cdbuilder_local_mirror
        }
 
-       if has_role('alioth_archive') {
-               include roles::alioth_archive
-       }
        if has_role('anonscm') {
                include roles::anonscm
        }
-
 }