X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Finit.pp;h=45ca3a5b4b7c30523fb144da6c08fad96dd9c15a;hb=b244b8852b6824886daaa28c76c3fda13f029ed9;hp=625ae5f054f5b311b3defbb23b9bc25c7e9d9b20;hpb=b8f97a2e6d381c15011add9afdffff931f79616c;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp index 625ae5f05..45ca3a5b4 100644 --- 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'], @@ -222,10 +225,6 @@ class roles { include roles::jenkins } - if has_role('memcached') { - include roles::memcached - } - if has_role('postgres_backup_server') { include postgres::backup_server } @@ -318,7 +317,7 @@ class roles { } if has_role('postgresql_server') { - include roles::postgresql_server + include postgres::backup_source } if has_role('bacula_director') { @@ -330,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 + } }