remove auto-cert and auto-clientcert symlinks from fileserver path

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d486e04..8ccca49 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -84,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'],
@@ -175,10 +178,6 @@ class roles {
                include roles::lists
        }
 
-       if has_role('list_search') {
-               include roles::listsearch
-       }
-
        if has_role('rtmaster') {
                include roles::rtmaster
        }
@@ -226,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
        }
@@ -259,6 +247,13 @@ class roles {
 
        if has_role('gobby_debian_org') {
                ssl::service { 'gobby.debian.org': notify  => Exec['service apache2 reload'], key => true, tlsaport => [443, 6523], }
+               file { '/etc/ssl/debian-local/other-keys/gobby.debian.org.key':
+                       ensure => present,
+                       mode => '0440',
+                       group => 'gobby',
+                       content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.letsencrypt_dir"]) + "/gobby.debian.org.key") %>'),
+                       links => follow,
+               }
        }
 
        if has_role('search_backend') {
@@ -329,7 +324,7 @@ class roles {
        }
 
        if has_role('postgresql_server') {
-               include roles::postgresql_server
+               include postgres::backup_source
        }
 
        if has_role('bacula_director') {
@@ -341,4 +336,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
+       }
 }