Start with salsa.debian.org role/module

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index e8e9801..6e6976e 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -76,6 +76,7 @@ class roles {
        if has_role('ftp_master') {
                include roles::ftp_master
                include roles::dakmaster
+               include roles::signing
        }
        if has_role('ftp.upload.d.o') {
                include roles::ftp_upload
@@ -83,6 +84,9 @@ class roles {
        if has_role('ssh.upload.d.o') {
                include roles::ssh_upload
        }
+       if has_role('security_upload') {
+               include roles::security_upload
+       }
        if has_role('api.ftp-master') {
                ssl::service { 'api.ftp-master.debian.org':
                        notify  => Exec['service apache2 reload'],
@@ -174,10 +178,6 @@ class roles {
                include roles::lists
        }
 
-       if has_role('list_search') {
-               include roles::listsearch
-       }
-
        if has_role('rtmaster') {
                include roles::rtmaster
        }
@@ -225,17 +225,6 @@ class roles {
                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
        }
@@ -285,10 +274,6 @@ class roles {
                ssl::service { 'sreview.debian.net': notify  => Exec['service apache2 reload'], key => true, }
        }
 
-       if has_role('httpredir') {
-               include roles::httpredir
-       }
-
        if has_role('debtags') {
                include roles::debtags
        }
@@ -344,4 +329,12 @@ class roles {
        if has_role('bacula_storage') {
                include bacula::storage
        }
+
+       if has_role('salsa.debian.org') {
+               include salsa
+       }
+
+       if $::keyring_debian_org_mirror {
+               include roles::keyring_debian_org_mirror
+       }
 }