Every weblog provider except mirror-umn is a static_mirror_web. So include weblog...

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 24069f1..9eb7378 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -197,14 +197,6 @@ roles:
     - vento.debian.org
   weblog_destination:
     - wolkenstein.debian.org
-  weblog_provider:
-    - klecker.debian.org
-    - mirror-anu.debian.org
-    - mirror-csail.debian.org
-    - mirror-isc.debian.org
-    - mirror-umn.debian.org
-    - santoro.debian.org
-    - senfter.debian.org
   wiki:
     - wilder.debian.org
   www_master:

diff --git a/modules/roles/manifests/init.pp b/modules/roles/manifests/init.pp
index d75913e..5ee825b 100644 (file)
--- a/modules/roles/manifests/init.pp
+++ b/modules/roles/manifests/init.pp
@@ -112,10 +112,6 @@ class roles {
                include roles::syncproxy
        }
 
-       if has_role('weblog_provider') {
-               include roles::weblog_provider
-       }
-
        if has_role('mailrelay') {
                include roles::mailrelay
        }

diff --git a/modules/roles/manifests/static_mirror_web.pp b/modules/roles/manifests/static_mirror_web.pp
index 9de4c3b..87e0f31 100644 (file)
--- a/modules/roles/manifests/static_mirror_web.pp
+++ b/modules/roles/manifests/static_mirror_web.pp
@@ -1,6 +1,7 @@
 # a static web mirror
 class roles::static_mirror_web {
   include roles::static_mirror
+  include roles::weblog_provider
 
   include apache2::expires
   include apache2::rewrite