remove diamond as secondary_ns

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 0a5da93ff2d460d048793a2219f6757f728a461e..c83884e5f6580d7f7b92bb1085cbbf5405fbea17 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') {
@@ -34,6 +42,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 +71,10 @@ class roles {
                include roles::ftp_upload
        }
 
+       if has_role('git_master') {
+               include roles::git_master
+       }
+
        if has_role('security_master') {
                include roles::security_master
                include roles::dakmaster
@@ -164,7 +181,23 @@ class roles {
                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('gobby_debian_org') {
+               ssl::service { 'gobby.debian.org':
+                       tlsaport => 0,
+               }
+       }
 }