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 bc752fb..0633b43 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -34,9 +34,6 @@ class roles {
                include roles::dakmaster
                include roles::signing
        }
-       if has_role('security_upload') {
-               include roles::security_upload
-       }
        #
        # security.debian.org
        if has_role('security_master') {
@@ -48,14 +45,6 @@ class roles {
                include roles::security_mirror
        }
 
-       if has_role('git_master') {
-               include roles::git_master
-       }
-
-       if has_role('wiki') {
-               include roles::wiki
-       }
-
        if has_role('syncproxy') {
                include roles::syncproxy
        }
@@ -97,10 +86,6 @@ class roles {
        }
 
 
-       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, }
        }