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 a4ef596..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,
                }
        }
 
@@ -69,6 +74,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
        }
@@ -77,6 +86,10 @@ class roles {
                include roles::ftp_upload
        }
 
+       if has_role('ssh.upload.d.o') {
+               include roles::ssh_upload
+       }
+
        if has_role('git_master') {
                include roles::git_master
        }
@@ -96,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
        }
@@ -170,6 +190,10 @@ class roles {
                include roles::sso
        }
 
+       if has_role('sso_rp') {
+               include roles::sso_rp
+       }
+
        if has_role('tracker') {
                include roles::tracker
        }
@@ -178,10 +202,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
        }
@@ -202,6 +222,10 @@ class roles {
                include roles::rtc
        }
 
+       if has_role('jenkins') {
+               include roles::jenkins
+       }
+
        if has_role('keystone') {
                include roles::keystone
        }
@@ -247,4 +271,68 @@ class roles {
        if has_role('search_frontend') {
                include search_frontend
        }
+
+       if has_role('dgit_browse') {
+               include dgit_browse
+       }
+       if has_role('dgit_git') {
+               include dgit_git
+       }
+
+       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,
+               }
+       }
+
+       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,
+               }
+       }
 }