X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-clients.conf.erb;h=6d2cd5bfe1b01d417d839a48d37baba9895fc9e3;hb=d0c098685b92334a611a0c596a35f538b95ead47;hp=edbf313651cabbb82012dfa1da142392671f9180;hpb=3693942d822dc7a6428525a84d994d5338a34fc0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/static-clients.conf.erb b/modules/roles/templates/static-mirroring/static-clients.conf.erb
index edbf31365..6d2cd5bfe 100644
--- a/modules/roles/templates/static-mirroring/static-clients.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-clients.conf.erb
@@ -4,15 +4,11 @@
 
 <%=
 
-mirrors = []
-scope.lookupvar('site::localinfo').keys.sort.each do |node|
-    if scope.lookupvar('site::localinfo')[node]['static_mirror']
-        mirrors << node
-    end
-end
+# do not include mirrors in static_mirror_nopush
+static_mirror_nopush = scope.lookupvar('deprecated::roles')['static_mirror_nopush']
 
+scope.lookupvar('deprecated::roles')['static_mirror'].reject{ |x| static_mirror_nopush.include?(x) }.join("\n")
 
-mirrors.join("\n")
 # vim:set et:
 # vim:set sts=4 ts=4:
 # vim:set shiftwidth=4: