Start moving bits from local.yaml to hiera

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 331aa118014b7f35b610adac3ac25c5882c3617e..38572402d4812b2ccb0d51d1214d7f41d513c000 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -1,6 +1,6 @@
 class roles {
 
-       if getfromhash($site::nodeinfo, 'puppetmaster') {
+       if $::hostname in hiera('roles::puppetmaster') {
                include puppetmaster
        }
 
@@ -14,10 +14,10 @@ class roles {
 
        if getfromhash($site::nodeinfo, 'buildd') {
                include buildd
-       } else {
-               class { 'buildd':
-                       ensure => absent
-               }
+       }
+
+       if getfromhash($site::nodeinfo, 'porterbox') {
+               include porterbox
        }
 
        if getfromhash($site::nodeinfo, 'bugs_mirror') {
@@ -37,10 +37,6 @@ class roles {
                include roles::www_mirror
        }
 
-       if getfromhash($site::nodeinfo, 'apache2_backports_mirror') {
-               include roles::backports_mirror
-       }
-
        if getfromhash($site::nodeinfo, 'ftp.d.o') {
                include roles::ftp
        }
@@ -49,11 +45,6 @@ class roles {
                include roles::ftp_upload
        }
 
-       if getfromhash($site::nodeinfo, 'backports_master') {
-               include roles::backports_master
-               include roles::dakmaster
-       }
-
        if getfromhash($site::nodeinfo, 'security_master') {
                include roles::security_master
                include roles::dakmaster
@@ -67,8 +58,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,4 +75,77 @@ class roles {
        } elsif getfromhash($site::nodeinfo, 'static_source') {
                include roles::static_source
        }
+
+       if getfromhash($site::nodeinfo, 'weblog_provider') {
+               include roles::weblog_provider
+       }
+
+       if getfromhash($site::nodeinfo, 'mailrelay') {
+               include roles::mailrelay
+       }
+
+       if getfromhash($site::nodeinfo, 'pubsub') {
+               include roles::pubsub
+       }
+
+       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'],
+               }
+       }
 }