make a hiera setting for mirror base directory (/srv/mirrors)

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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 76c02ed..3201ad5 100644 (file)
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -3,6 +3,10 @@ nameservers: []
 searchpaths: []
 resolvoptions: []
 allow_dns_query: []
+role_config__mirrors:
+  mirror_basedir_prefix: '/srv/mirrors/'
+role_config__syncproxy:
+  mirror_basedir_prefix: '/srv/mirrors/'
 roles:
   bugsmx:
     - buxtehude.debian.org
@@ -36,7 +40,6 @@ roles:
     - fasolo.debian.org
   ftp.upload.d.o:
     - coccia.debian.org
-    - suchon.debian.org
     - usper.debian.org
   api.ftp-master:
     - coccia.debian.org
@@ -185,6 +188,7 @@ roles:
     - klecker.debian.org
     - milanollo.debian.org
     - mirror-anu.debian.org
+    - mirror-conova.debian.org
     - mirror-isc.debian.org
     - mirror-umn.debian.org
   tracker:
@@ -288,7 +292,6 @@ roles:
     - sechter.debian.org
     - setoguchi.debian.org
     - ticharich.debian.org
-    - villa.debian.org
   bgp:
     - mirror-bytemark.debian.org
     - mirror-conova.debian.org
@@ -302,6 +305,7 @@ roles:
     - tchaikovsky.debian.org
     - wuiet.debian.org
   postgresql_server:
+    # postgresql instances not managed by puppet otherwise
     - bmdb1.debian.org
     - buxtehude.debian.org
     - danzi.debian.org
@@ -312,3 +316,5 @@ roles:
     - vittoria.debian.org
   salsa.debian.org:
     - godard.debian.org
+  insecure_ssl:
+    - godard.debian.org