security_mirror -> hiera role; part 2; also make security apache bind to the security...

[mirror/dsa-puppet.git] / data / common.yaml

diff --git a/data/common.yaml b/data/common.yaml
index 635f03e..f5c4b7f 100644 (file)
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -54,42 +54,6 @@ apt::sources::debian::location: 'https://deb.debian.org/debian/'
 # all of these should be retired in favour of including the class role
 # with the host. weasel, 2019-09
 roles:
-  security_mirror:
-    # XXX used also in ferm me.conf.erb
-    mirror-anu.debian.org:
-      fastly-backend: false
-    mirror-csail.debian.org:
-      fastly-backend: false
-    mirror-isc.debian.org:
-      onion_v4_address: 149.20.4.14
-    mirror-umn.debian.org:
-      onion_v4_address: 128.101.240.215
-    mirror-accumu.debian.org:
-      fastly-backend: false
-    mirror-skroutz.debian.org:
-      fastly-backend: false
-    lobos.debian.org:
-      service-hostname: lobos.security.backend.mirrors.debian.org
-      fastly-backend: false
-      onion_v4_address: 212.211.132.250
-    santoro.debian.org:
-      fastly-backend: false
-    schmelzer.debian.org:
-      fastly-backend: false
-    schumann.debian.org:
-      service-hostname: schumann.security.backend.mirrors.debian.org
-      fastly-backend: true
-    setoguchi.debian.org:
-      fastly-backend: false
-    sechter.debian.org:
-      fastly-backend: false
-    villa.debian.org:
-      service-hostname: villa.security.backend.mirrors.debian.org
-      fastly-backend: true
-      onion_v4_address: 212.211.132.32
-    wieck.debian.org:
-      service-hostname: wieck.security.backend.mirrors.debian.org
-      fastly-backend: true
   postgres_backup_server:
     # XXX - used by ferm templates/defs.conf.erb
     - backuphost.debian.org