DynamicUser and python don't mix, apply by hand instead

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index ab1f696..45ca3a5 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'],
@@ -314,7 +317,7 @@ class roles {
        }
 
        if has_role('postgresql_server') {
-               include roles::postgresql_server
+               include postgres::backup_source
        }
 
        if has_role('bacula_director') {
@@ -327,6 +330,10 @@ class roles {
                include bacula::storage
        }
 
+       if has_role('salsa.debian.org') {
+               include salsa
+       }
+
        if $::keyring_debian_org_mirror {
                include roles::keyring_debian_org_mirror
        }