From 082766602e12f4b7a0435a3b4496a3f2ddbdc7f1 Mon Sep 17 00:00:00 2001
From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Sep 2019 21:58:23 +0200
Subject: [PATCH] static-components: rename variables

---
 .../static-components.conf.erb                | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/roles/templates/static-mirroring/static-components.conf.erb b/modules/roles/templates/static-mirroring/static-components.conf.erb
index 117828e0c..aa43c9a39 100644
--- a/modules/roles/templates/static-mirroring/static-components.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-components.conf.erb
@@ -14,35 +14,35 @@ lines << "# <master> <service> <source host> <directory> <extra push hosts, comm
 config = YAML.load(File.open('/etc/puppet/modules/roles/misc/static-components.yaml').read)
 mirrors = scope.lookupvar('site::roles')['static_mirror']
 
-config['components'].each_pair do |component, conf|
+config['components'].each_pair do |component_name, component_conf|
 	%w{exclude-mirrors extra-push limit-mirrors}.each do |key|
-		conf[key] = [] unless conf.has_key?(key)
+		component_conf[key] = [] unless component_conf.has_key?(key)
 	end
 
-	srchost, srcpath = conf['source'].split(':', 2)
+	srchost, srcpath = component_conf['source'].split(':', 2)
 
 	config['mirrors'].each do |mirror, mc|
 		next unless mirrors.include?(mirror)
 
-		if mc.has_key?('components-include') and not mc['components-include'].include?(component)
-			conf['exclude-mirrors'] << mirror
+		if mc.has_key?('components-include') and not mc['components-include'].include?(component_name)
+			component_conf['exclude-mirrors'] << mirror
 		end
 	end
-	if conf['limit-mirrors'].size > 0
+	if component_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
+			if not component_conf['limit-mirrors'].include?(mirror)
+				next if component_conf['exclude-mirrors'].include?(mirror) # if it's already excluded, do not add it again
+				component_conf['exclude-mirrors'] << mirror
 			end
 		end
 	end
 
-	exclude = conf['exclude-mirrors'].join(',')
+	exclude = component_conf['exclude-mirrors'].join(',')
 	exclude = '-' unless exclude != ""
-	extrapush = conf['extra-push'].join(',')
+	extrapush = component_conf['extra-push'].join(',')
 	extrapush = '-' unless extrapush != ""
 
-	lines << "#{conf['master']} #{component} #{srchost} #{srcpath} #{extrapush} #{exclude}"
+	lines << "#{component_conf['master']} #{component_name} #{srchost} #{srcpath} #{extrapush} #{exclude}"
 end
 lines.join("\n")
 %>
-- 
2.20.1