From 0a9e71cc16c9887f99b5987dc31b51a5be038c46 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sat, 14 Sep 2019 23:50:36 +0200 Subject: [PATCH] Every weblog provider except mirror-umn is a static_mirror_web. So include weblog provider from static_mirror_web. umn was one of those at one point but is not at the time. this effectively drops it from the weblog providers --- hieradata/common.yaml | 8 -------- modules/roles/manifests/init.pp | 4 ---- modules/roles/manifests/static_mirror_web.pp | 1 + 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/hieradata/common.yaml b/hieradata/common.yaml index 24069f18a..9eb737897 100644 --- 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 d75913e00..5ee825bc4 100644 --- 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 9de4c3b8e..87e0f31ca 100644 --- 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 -- 2.20.1