From: Julien Cristau <jcristau@debian.org>
Date: Mon, 18 Mar 2019 15:16:40 +0000 (+0100)
Subject: Move more hiera stuff from mirror-conova to schmelzer
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=cea821fd61e9b2feeab05a6b8982c2941226172d;p=mirror%2Fdsa-puppet.git

Move more hiera stuff from mirror-conova to schmelzer
---

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 05e8f52ba..00c9c169b 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -267,16 +267,16 @@ roles:
       fastly-backend: true
     mirror-conova.debian.org:
       service-hostname: conova.debian.backend.mirrors.debian.org
-      listen-addresses:
-        - '217.196.149.232:80'
-        - '[2a02:16a8:dc41:100::232]:80'
-      fastly-backend: true
     mirror-isc.debian.org:
       listen-addresses:
         - '149.20.4.15:80'
         - '[2001:4f8:1:c::15]:80'
       onion_v4_address: 149.20.4.15
     schmelzer.debian.org:
+      listen-addresses:
+        - '217.196.149.232:80'
+        - '[2a02:16a8:dc41:100::232]:80'
+      fastly-backend: true
       service-hostname: conova.debian.backend.mirrors.debian.org
   historical_master:
     - sibelius.debian.org
@@ -288,10 +288,6 @@ roles:
     - sibelius.debian.org
   debug_mirror:
     mirror-conova.debian.org:
-      listen-addresses:
-        - '217.196.149.232:80'
-        - '[2a02:16a8:dc41:100::232]:80'
-      onion_v4_address: 217.196.149.232
       service-hostname: conova.debug.backend.mirrors.debian.org
     mirror-accumu.debian.org:
       onion_v4_address: 130.242.6.199