X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Ftemplates%2Fstatic-mirroring%2Fstatic-components.conf.erb;h=117828e0c6bdaf9852701b91c0a24805b607e6e2;hb=09c80262c3d713f889e018c471b7a1de9fbc4407;hp=1656082d14fba11b40630bb99716c26fd1a224af;hpb=cb556ed8e7a2db65c6af586125128d02b28fbee3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/templates/static-mirroring/static-components.conf.erb b/modules/roles/templates/static-mirroring/static-components.conf.erb
index 1656082d1..117828e0c 100644
--- a/modules/roles/templates/static-mirroring/static-components.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-components.conf.erb
@@ -15,7 +15,7 @@ config = YAML.load(File.open('/etc/puppet/modules/roles/misc/static-components.y
 mirrors = scope.lookupvar('site::roles')['static_mirror']
 
 config['components'].each_pair do |component, conf|
-	%w{exclude-mirrors extra-push}.each do |key|
+	%w{exclude-mirrors extra-push limit-mirrors}.each do |key|
 		conf[key] = [] unless conf.has_key?(key)
 	end
 
@@ -28,6 +28,14 @@ config['components'].each_pair do |component, conf|
 			conf['exclude-mirrors'] << mirror
 		end
 	end
+	if conf['limit-mirrors'].size > 0
+		mirrors.each do |mirror|
+			if not conf['limit-mirrors'].include?(mirror)
+				next if conf['exclude-mirrors'].include?(mirror) # if it's already excluded, do not add it again
+				conf['exclude-mirrors'] << mirror
+			end
+		end
+	end
 
 	exclude = conf['exclude-mirrors'].join(',')
 	exclude = '-' unless exclude != ""