X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-clients.conf.erb;h=33f9644a93afc9526bdcde8640616e1615b0a407;hb=5e199fb1c81aa1b3282fab2b5538e5d4e96b4db7;hp=8e2b872172a365cd968349af7cc7e1cebc267d40;hpb=73b5e0f765fe99a5c0c6999898d931b9e0e91300;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 8e2b87217..33f9644a9 100644
--- a/modules/roles/templates/static-mirroring/static-clients.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-clients.conf.erb
@@ -4,7 +4,10 @@
 
 <%=
 
-scope.lookupvar('site::roles')['static_mirror'].join("\n")
+# do not include mirrors in static_mirror_nopush
+static_mirror_nopush = scope.lookupvar('site::roles')['static_mirror_nopush']
+
+scope.lookupvar('site::roles')['static_mirror'].reject{ |x| static_mirror_nopush.include?(x) }.join("\n")
 
 # vim:set et:
 # vim:set sts=4 ts=4: