try to rolify dns

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 1178aa3ecfb45a9e5e51c25aeb6611da3b955f07..21559a8bc11d37bb1560c7c03c617be5f1877820 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -2,7 +2,7 @@ class roles {
 
        $roles = hiera('roles')
 
-       if $::hostname in $roles['puppetmaster'] {
+       if $::fqdn in $roles['puppetmaster'] {
                include puppetmaster
        }
 
@@ -10,9 +10,12 @@ class roles {
                include munin::master
        }
 
-       #if getfromhash($site::nodeinfo, 'nagiosmaster') {
+       if getfromhash($site::nodeinfo, 'nagiosmaster') {
        #       include nagios::server
-       #}
+               ssl::service { 'nagios.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd
@@ -90,6 +93,19 @@ class roles {
                include roles::pubsub
        }
 
+       if getfromhash($site::nodeinfo, 'dbmaster') {
+               ssl::service { 'db.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if getfromhash($site::nodeinfo, 'dns_primary') {
+               include named::primary
+       }
+       if getfromhash($site::nodeinfo, 'dns_secondary') {
+               include named::authoritative
+       }
+
        if $::hostname in [ravel] {
                include roles::weblog_destination
        }
@@ -150,4 +166,10 @@ class roles {
                        notify => Service['apache2'],
                }
        }
+
+       if $::hostname in [franck] {
+               ssl::service { 'release.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
 }