From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 4 Dec 2015 16:26:27 +0000 (+0000)
Subject: add mirror-isc and mirror-umn
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=387dbca8ca018c01443b599167a3e163eaa66aa6;p=mirror%2Fdsa-puppet.git

add mirror-isc and mirror-umn

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7d37ca867..d6a84c052 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -120,7 +120,10 @@ roles:
     - busoni.debian.org
     - klecker.debian.org
     - senfter.debian.org
+    - mirror-anu.debian.org
+    - mirror-isc.debian.org
     - mirror-csail.debian.org
+    - mirror-umn.debian.org
   # when adding a new static mirror, allow it to sync etc, but do not push to it and wait for it.  For this, also add it to static_mirror_nopush.
   static_mirror_nopush:
     - dummy
@@ -146,11 +149,13 @@ roles:
   weblog_provider:
     - gluck.debian.org
     - mirror-anu.debian.org
+    - mirror-isc.debian.org
+    - mirror-csail.debian.org
+    - mirror-umn.debian.org
     - santoro.debian.org
     - busoni.debian.org
     - klecker.debian.org
     - senfter.debian.org
-    - mirror-csail.debian.org
   wiki:
     - wilder.debian.org
   www_master:
diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index 76adea412..7a78a004a 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -158,8 +158,10 @@ host_settings:
   apache2_security_mirror:
     - gluck.debian.org
     - mirror-anu.debian.org
-    - lobos.debian.org
     - mirror-csail.debian.org
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
+    - lobos.debian.org
     - saens.debian.org
     - santoro.debian.org
     - setoguchi.debian.org
@@ -180,7 +182,6 @@ host_settings:
     - bizet.debian.org
     - busoni.debian.org
     - gluck.debian.org
-    - mirror-anu.debian.org
     - pkgmirror-1and1.debian.org
     - schein.debian.org
     - saens.debian.org
@@ -189,6 +190,9 @@ host_settings:
     - spohr.debian.org
     - steffani.debian.org
     - wieck.debian.org
+    - mirror-anu.debian.org
+    - mirror-isc.debian.org
+    - mirror-umn.debian.org
     # porterbox
     - abel.debian.org
     - asachi.debian.org