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 a15eecf1c08fbd8e0d736da54bdad590b24930b5..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
        }
 
@@ -92,12 +92,48 @@ class roles {
                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'],