mirror-conova: move syncproxy to default paths, move debian mirrors to public-* paths

diff --git a/hieradata/nodes/mirror-conova.debian.org.yaml b/hieradata/nodes/mirror-conova.debian.org.yaml
index d1afe2b..992f744 100644 (file)
--- a/hieradata/nodes/mirror-conova.debian.org.yaml
+++ b/hieradata/nodes/mirror-conova.debian.org.yaml
@@ -1,2 +1,2 @@
-role_config__syncproxy:
-  mirror_basedir_prefix: '/srv/mirrors/syncproxy-'
+role_config__mirrors:
+  mirror_basedir_prefix: '/srv/mirrors/public-'

diff --git a/modules/debian_org/lib/facter/paths.rb b/modules/debian_org/lib/facter/paths.rb
index ad4e984..b02f5ff 100644 (file)
--- a/modules/debian_org/lib/facter/paths.rb
+++ b/modules/debian_org/lib/facter/paths.rb
@@ -6,10 +6,10 @@
    /srv/mirrors/debian-debug
    /srv/mirrors/debian-ports
    /srv/mirrors/debian-security
-   /srv/mirrors/syncproxy-debian
-   /srv/mirrors/syncproxy-debian-debug
-   /srv/mirrors/syncproxy-debian-ports
-   /srv/mirrors/syncproxy-debian-security
+   /srv/mirrors/public-debian
+   /srv/mirrors/public-debian-debug
+   /srv/mirrors/public-debian-ports
+   /srv/mirrors/public-debian-security
    /dev/hwrng
 }.each do |path|
        Facter.add("has" + path.gsub(/[\/-]/,'_')) do