Ship ssl certs for i18n and l10n.d.o

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index c0b46e2..c36e2d2 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -69,6 +69,10 @@ class roles {
                include roles::www_mirror
        }
 
+       if has_role('mirror_debug') {
+               include roles::debug_mirror
+       }
+
        if has_role('ftp.d.o') {
                include roles::ftp
        }
@@ -100,6 +104,13 @@ class roles {
                include roles::www_master
        }
 
+       if has_role('cgi.d.o') {
+               ssl::service { 'cgi.debian.org':
+                       notify => Service['apache2'],
+                       key => true,
+               }
+       }
+
        if has_role('keyring') {
                include roles::keyring
        }
@@ -186,10 +197,6 @@ class roles {
                include roles::buildd_master
        }
 
-       if has_role('buildd_ports_master') {
-               include roles::buildd_ports_master
-       }
-
        if has_role('piuparts') {
                include roles::piuparts
        }
@@ -210,6 +217,10 @@ class roles {
                include roles::rtc
        }
 
+       if has_role('jenkins') {
+               include roles::jenkins
+       }
+
        if has_role('keystone') {
                include roles::keystone
        }
@@ -266,4 +277,39 @@ class roles {
        if $::hostname in [lw01, lw02, lw03, lw04] {
                include snapshot
        }
+
+       if has_role('veyepar.debian.org') {
+               ssl::service { 'veyepar.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if has_role('httpredir') {
+               include roles::httpredir
+       }
+
+       if has_role('debtags') {
+               include roles::debtags
+       }
+
+       if has_role('planet_search') {
+               ssl::service { 'planet-search.debian.org':
+                       notify => Service['apache2'],
+                       key => true,
+               }
+       }
+
+       if has_role('i18n.d.o') {
+               ssl::service { 'i18n.debian.org':
+                       notify => Service['apache2'],
+                       key => true,
+               }
+       }
+
+       if has_role('l10n.d.o') {
+               ssl::service { 'l10n.debian.org':
+                       notify => Service['apache2'],
+                       key => true,
+               }
+       }
 }