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 4e878b9..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,
                }
        }
 
@@ -53,6 +58,12 @@ class roles {
                include roles::dakmaster
        }
 
+       if has_role('api.ftp-master') {
+               ssl::service { 'api.ftp-master.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
        # XXX: turn this into a real role
        if getfromhash($site::nodeinfo, 'apache2_security_mirror') {
                include roles::security_mirror
@@ -63,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
        }
@@ -71,10 +86,20 @@ 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
        }
 
+       if has_role('people') {
+               ssl::service { 'people.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
        if has_role('security_master') {
                include roles::security_master
                include roles::dakmaster
@@ -84,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
        }
@@ -142,6 +174,10 @@ class roles {
                include roles::lists
        }
 
+       if has_role('list_search') {
+               include roles::listsearch
+       }
+
        if has_role('rtmaster') {
                include roles::rtmaster
        }
@@ -154,6 +190,14 @@ class roles {
                include roles::sso
        }
 
+       if has_role('sso_rp') {
+               include roles::sso_rp
+       }
+
+       if has_role('tracker') {
+               include roles::tracker
+       }
+
        if has_role('buildd_master') {
                include roles::buildd_master
        }
@@ -178,9 +222,20 @@ class roles {
                include roles::rtc
        }
 
+       if has_role('jenkins') {
+               include roles::jenkins
+       }
+
        if has_role('keystone') {
                include roles::keystone
        }
+       if has_role('keystone_rabbitmq') {
+               include roles::keystone::rabbitmq
+       }
+
+       if has_role('memcached') {
+               include roles::memcached
+       }
 
        if has_role('postgres_backup_server') {
                include postgres::backup_server
@@ -192,9 +247,92 @@ class roles {
                }
        }
 
+       if has_role('qamaster') {
+               ssl::service { 'qa.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
+       if has_role('packagesqamaster') {
+               ssl::service { 'packages.qa.debian.org':
+                       notify => Service['apache2'],
+               }
+       }
+
        if has_role('gobby_debian_org') {
                ssl::service { 'gobby.debian.org':
-                       tlsaport => 0,
+                       notify => Service['apache2'],
+               }
+       }
+
+       if has_role('search_backend') {
+               include search_backend
+       }
+       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,
                }
        }
 }