restrict,pty is a better way to get pty and disable everything else than listing...

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index da2855b..3960f1e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -15,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
        }
@@ -34,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",
                }
@@ -215,10 +205,6 @@ class roles {
                include roles::rtc
        }
 
-       if has_role('jenkins') {
-               include roles::jenkins
-       }
-
        if has_role('postgres_backup_server') {
                include postgres::backup_server
        }