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 fad6b087a436751f643a1ef183d5263ec6fb78dd..21559a8bc11d37bb1560c7c03c617be5f1877820 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,6 +1,8 @@
 class roles {
 
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
+       $roles = hiera('roles')
+
+       if $::fqdn in $roles['puppetmaster'] {
                include puppetmaster
        }
 
@@ -8,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
@@ -58,8 +63,12 @@ class roles {
                include roles::keyring
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_ftp-upcoming_mirror') {
-               include roles::ftp-upcoming_mirror
+       if getfromhash($site::nodeinfo, 'wiki') {
+               include roles::wiki
+       }
+
+       if getfromhash($site::nodeinfo, 'syncproxy') {
+               include roles::syncproxy
        }
 
        if getfromhash($site::nodeinfo, 'static_master') {
@@ -80,7 +89,87 @@ class roles {
                include roles::mailrelay
        }
 
+       if getfromhash($site::nodeinfo, 'pubsub') {
+               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
        }
+
+       if $::hostname in [vento] {
+               ssl::service { 'vote.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [soler] {
+               ssl::service { 'security-tracker.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [bendel] {
+               ssl::service { 'lists.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [reger] {
+               ssl::service { 'rt.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [diabelli] {
+               ssl::service { 'sso.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if $::hostname in [ullmann] {
+               ssl::service { 'udd.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+       
+       if $::hostname in [wuiet] {
+               ssl::service { 'buildd.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'],
+               }
+       }
+
+       if $::hostname in [franck] {
+               ssl::service { 'release.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
 }