From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 10 Sep 2019 20:25:49 +0000 (+0200)
Subject: sort mirror names
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=110edf09b33514b1e772cfb24f5acbb7d9038e8e;p=mirror%2Fdsa-puppet.git

sort mirror names
---

diff --git a/modules/roles/templates/static-mirroring/static-components.conf.erb b/modules/roles/templates/static-mirroring/static-components.conf.erb
index aa43c9a39..fb89f4634 100644
--- a/modules/roles/templates/static-mirroring/static-components.conf.erb
+++ b/modules/roles/templates/static-mirroring/static-components.conf.erb
@@ -37,9 +37,10 @@ config['components'].each_pair do |component_name, component_conf|
 		end
 	end
 
-	exclude = component_conf['exclude-mirrors'].join(',')
+
+	exclude = component_conf['exclude-mirrors'].sort().join(',')
 	exclude = '-' unless exclude != ""
-	extrapush = component_conf['extra-push'].join(',')
+	extrapush = component_conf['extra-push'].sort().join(',')
 	extrapush = '-' unless extrapush != ""
 
 	lines << "#{component_conf['master']} #{component_name} #{srchost} #{srcpath} #{extrapush} #{exclude}"