Revert "Revert "ssh_upload -> hiera role""

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

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index 4eddc24..83ddc6c 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,12 +34,6 @@ class roles {
                include roles::dakmaster
                include roles::signing
        }
-       if has_role('ftp.upload.d.o') {
-               include roles::ftp_upload
-       }
-       if has_role('ssh.upload.d.o') {
-               include roles::ssh_upload
-       }
        if has_role('security_upload') {
                include roles::security_upload
        }
@@ -164,10 +158,6 @@ class roles {
                include postgres::backup_source
        }
 
-       if has_role('bacula_storage') {
-               include bacula::storage
-       }
-
        if $::keyring_debian_org_mirror {
                include roles::keyring_debian_org_mirror
        }