and attach the role

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ef8a24794ec807f6ad9aff74755b93d61441baa5..6f62ca8fc83a34f99c9b99b02c3836b7898f2025 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -84,6 +84,14 @@ class roles {
                include roles::mailrelay
        }
 
+       if getfromhash($site::nodeinfo, 'pubsub') {
+               include roles::pubsub
+       }
+
+       if getfromhash($site::nodeinfo, 'buildd_master') {
+               include roles::buildd_master
+       }
+
        if $::hostname in [ravel] {
                include roles::weblog_destination
        }
@@ -93,4 +101,19 @@ class roles {
                        notify => Service['apache2'],
                }
        }
+
+       if $::hostname in [pejacevic] {
+               ssl::service { 'piuparts.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [nono] {
+               ssl::service { 'nm.debian.org':
+                       notify => Service['apache2'],
+               }
+               ssl::service { 'contributors.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
 }