Retire sso_rp (SSO, relying party) role for hosts

[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..0633b43 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,15 +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
-       }
        #
        # security.debian.org
        if has_role('security_master') {
@@ -54,18 +45,6 @@ class roles {
                include roles::security_mirror
        }
 
-       if has_role('git_master') {
-               include roles::git_master
-       }
-
-       if has_role('www_master') {
-               include roles::www_master
-       }
-
-       if has_role('wiki') {
-               include roles::wiki
-       }
-
        if has_role('syncproxy') {
                include roles::syncproxy
        }
@@ -106,17 +85,6 @@ class roles {
                include postgres::backup_server
        }
 
-       if has_role('packages') {
-               ssl::service { 'packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
-       if has_role('historicalpackages') {
-               ssl::service { 'historical.packages.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
-       if has_role('qamaster') {
-               ssl::service { 'qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
 
        if has_role('packagesqamaster') {
                ssl::service { 'packages.qa.debian.org': notify  => Exec['service apache2 reload'], key => true, }
@@ -134,21 +102,6 @@ class roles {
                include roles::snapshot_shell
        }
 
-       if has_role('planet_master') {
-               include roles::planet_master
-       }
-       if has_role('planet_search') {
-               ssl::service { 'planet-search.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
-       if has_role('i18n.d.o') {
-               ssl::service { 'i18n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
-       if has_role('l10n.d.o') {
-               ssl::service { 'l10n.debian.org': notify  => Exec['service apache2 reload'], key => true, }
-       }
-
        if has_role('ports_master') {
                include roles::ports_master
        }
@@ -164,10 +117,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
        }