From 59ed8099b6047999ff68b9dc652e9cf7477edf69 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Tue, 12 Sep 2017 11:55:42 +0000 Subject: [PATCH] mirror-conova: move syncproxy to default paths, move debian mirrors to public-* paths --- hieradata/nodes/mirror-conova.debian.org.yaml | 4 ++-- modules/debian_org/lib/facter/paths.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hieradata/nodes/mirror-conova.debian.org.yaml b/hieradata/nodes/mirror-conova.debian.org.yaml index d1afe2b8d..992f744ae 100644 --- 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 ad4e9841a..b02f5ffcc 100644 --- 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 -- 2.20.1