include archive_master role too

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 76b8297..31c1650 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -33,6 +33,10 @@ class roles {
                include porterbox
        }
 
+       if has_role('archive_master') {
+               include archive_master
+       }
+
        if has_role('bugs_mirror') {
                include roles::bugs_mirror
        }
@@ -45,6 +49,7 @@ class roles {
        if has_role('bugs_master') {
                ssl::service { 'bugs-master.debian.org':
                        notify => Service['apache2'],
+                       key => true,
                }
        }
 
@@ -104,6 +109,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
        }
@@ -288,6 +300,39 @@ class roles {
        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,
+               }
+       }
+
+       if has_role('dedup.d.n') {
+               ssl::service { 'dedup.debian.net':
+                       notify => Service['apache2'],
+                       key => true,
+               }
+       }
+
+       if has_role('pet.d.n') {
+               ssl::service { 'pet.debian.net':
+                       notify => Service['apache2'],
+                       key => true,
+               }
+               ssl::service { 'pet-devel.debian.net':
+                       notify => Service['apache2'],
+                       key => true,
                }
        }
 }