Make metadata-backend.ftp-master hopefully work

[mirror/dsa-puppet.git] / modules / roles / templates / static-mirroring / static-components.conf.erb

diff --git a/modules/roles/templates/static-mirroring/static-components.conf.erb b/modules/roles/templates/static-mirroring/static-components.conf.erb
index 56a822f..117828e 100644 (file)
--- a/modules/roles/templates/static-mirroring/static-components.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-components.conf.erb
@@ -15,15 +15,23 @@ 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
 
        srchost, srcpath = conf['source'].split(':', 2)
 
        config['mirrors'].each do |mirror, mc|
-               if mirrors.include?(mirror)
-                       if mc.has_key?('components-include') and not mc['components-include'].include?(component)
+               next unless mirrors.include?(mirror)
+
+               if mc.has_key?('components-include') and not mc['components-include'].include?(component)
+                       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