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 d5340689762e4d0df75023aa45cc6489ff4afa9a..6f62ca8fc83a34f99c9b99b02c3836b7898f2025 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -62,8 +62,8 @@ class roles {
                include roles::wiki
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       if getfromhash($site::nodeinfo, 'syncproxy') {
+               include roles::syncproxy
        }
 
        if getfromhash($site::nodeinfo, 'static_master') {
@@ -84,7 +84,36 @@ 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
        }
+
+       if $::hostname in [soler] {
+               ssl::service { 'security-tracker.debian.org':
+                       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'],
+               }
+       }
 }