Sort hashes in templates so config files are not modified in every pu…

…ppet run (and so, ssh is not restarted without need)
xbezdick · Feb 27, 2014 · db17c3d · db17c3d
2 parents 80d4403 + 3fe49d0
commit db17c3d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/templates/ssh_config.erb b/templates/ssh_config.erb
@@ -1,9 +1,9 @@
 # File managed by Puppet
 
-<%- scope.lookupvar('ssh::client::merged_options').each do |k, v| -%>
+<%- scope.lookupvar('ssh::client::merged_options').sort.each do |k, v| -%>
 <%- if v.is_a?(Hash) -%>
 <%= k %>
-<%- v.each do |key, value| -%>
+<%- v.sort.each do |key, value| -%>
     <%- if value.is_a?(Array) -%>
     <%- value.each do |a| -%>
     <%= key %> <%= a %>

diff --git a/templates/sshd_config.erb b/templates/sshd_config.erb
@@ -1,9 +1,9 @@
 # File is managed by Puppet
 
-<%- scope.lookupvar('ssh::server::merged_options').each do |k, v| -%>
+<%- scope.lookupvar('ssh::server::merged_options').sort.each do |k, v| -%>
 <%- if v.is_a?(Hash) -%>
 <%= k %>
-<%- v.each do |key, value| -%>
+<%- v.sort.each do |key, value| -%>
     <%- if value.is_a?(Array) -%>
     <%- value.each do |a| -%>
     <%= key %> <%= a %>