cdbuilder_local_mirror role cleanup

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 57ada6b..6b9af9b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,21 +15,6 @@ class roles {
                include nagios::server
        }
 
-       if has_role('bugs_base') {
-               ssl::service { 'bugs.debian.org':
-                       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, }
-       }
-
        if has_role('manpages-dyn') {
                include roles::manpages_dyn
        }
@@ -132,10 +117,6 @@ class roles {
                include roles::security_tracker
        }
 
-       if has_role('lists') {
-               include roles::lists
-       }
-
        if has_role('rtmaster') {
                include roles::rtmaster
        }
@@ -311,8 +292,4 @@ class roles {
        if has_role('debconf_wafer') {
                include roles::debconf_wafer
        }
-
-       if has_role('cdbuilder_local_mirror') {
-               include roles::cdbuilder_local_mirror
-       }
 }