roles: drop redundant configuration

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 5f106c3896f75365732e4376fd5396ecc759b2fd..5ec93d16afc8f4acb2137fdc8e4eb58bba949bed 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,3 +1,11 @@
+# = Class: roles
+#
+# Lookup role and include relevant classes for roles
+#
+# == Sample Usage:
+#
+#   include roles
+#
 class roles {
 
        if has_role('puppetmaster') {
@@ -22,7 +30,13 @@ class roles {
 
        # XXX: turn this into a real role
        if getfromhash($site::nodeinfo, 'porterbox') {
-               include porterbox
+               class {'porterbox':
+                       ensure => present,
+               }
+       } else {
+               class {'porterbox':
+                       ensure => absent,
+               }
        }
 
        if has_role('bugs_mirror') {
@@ -34,6 +48,11 @@ class roles {
                        notify => Service['apache2'],
                }
        }
+       if has_role('bugs_master') {
+               ssl::service { 'bugs-master.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
 
        if has_role('ftp_master') {
                include roles::ftp_master
@@ -58,6 +77,16 @@ class roles {
                include roles::ftp_upload
        }
 
+       if has_role('git_master') {
+               include roles::git_master
+       }
+
+       if has_role('people') {
+               ssl::service { 'people.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
        if has_role('security_master') {
                include roles::security_master
                include roles::dakmaster
@@ -108,9 +137,6 @@ class roles {
        if has_role('dns_primary') {
                include named::primary
        }
-       if has_role('dns_secondary') {
-               include named::authoritative
-       }
 
        if has_role('weblog_destination') {
                include roles::weblog_destination
@@ -140,10 +166,18 @@ class roles {
                include roles::sso
        }
 
+       if has_role('tracker') {
+               include roles::tracker
+       }
+
        if has_role('buildd_master') {
                include roles::buildd_master
        }
 
+       if has_role('buildd_ports_master') {
+               include roles::buildd_ports_master
+       }
+
        if has_role('piuparts') {
                include roles::piuparts
        }
@@ -163,4 +197,36 @@ class roles {
        if has_role('rtc') {
                include roles::rtc
        }
+
+       if has_role('keystone') {
+               include roles::keystone
+       }
+
+       if has_role('postgres_backup_server') {
+               include postgres::backup_server
+       }
+
+       if has_role('packages') {
+               ssl::service { 'packages.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if has_role('qamaster') {
+               ssl::service { 'qa.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if has_role('packagesqamaster') {
+               ssl::service { 'packages.qa.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if has_role('gobby_debian_org') {
+               ssl::service { 'gobby.debian.org':
+                       tlsaport => 0,
+               }
+       }
 }