Merge pull request #52 from iksteen/inconsistent-hash-order

Stabilize key/value output by sorting hashes on key.

templates/conf.d/upstream.erb

@@ -1,5 +1,5 @@
 upstream <%= name %> {
-<% if @upstream_cfg_prepend -%><% upstream_cfg_prepend.each do |key,value| -%>
+<% if @upstream_cfg_prepend -%><% upstream_cfg_prepend.sort_by{|k,v| k}.each do |key,value| -%>
   <%= key %> <%= value %>;<% end -%><% end -%>
   <% members.each do |i| %>
   server     <%= i %>;<% end %>

templates/vhost/vhost_location_alias.erb

@@ -1,7 +1,7 @@
   location <%= location %> {
-<% if @location_cfg_prepend -%><% location_cfg_prepend.each do |key,value| -%>
+<% if @location_cfg_prepend -%><% location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
     <%= key %> <%= value %>;<% end -%><% end -%>
     alias      <%= location_alias %>;
-<% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
+<% if @location_cfg_append -%><% location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
     <%= key %> <%= value %>;<% end -%><% end -%>
   }

templates/vhost/vhost_location_directory.erb

@@ -1,13 +1,13 @@
   location <%= location %> {
-<% if @location_cfg_prepend -%><% location_cfg_prepend.each do |key,value| -%>
+<% if @location_cfg_prepend -%><% location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
     <%= key %> <%= value %>;
 <% end -%><% end -%>
     root  <%= www_root %>;
     <% if @try_files -%>
     try_files <% try_files.each do |try| -%> <%= try %> <% end -%>;
     <% end -%>
     index <% index_files.each do |i| %> <%= i %> <% end %>; 
-<% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
+<% if @location_cfg_append -%><% location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
     <%= key %> <%= value %>;
 <% end -%><% end -%>
   }

templates/vhost/vhost_location_proxy.erb

@@ -1,10 +1,10 @@
   location <%= location %> {
-<% if @location_cfg_prepend -%><% location_cfg_prepend.each do |key,value| -%>
+<% if @location_cfg_prepend -%><% location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
     <%= key %>         <%= value %>;
 <% end -%><% end -%>
     proxy_pass         <%= proxy %>;
     proxy_read_timeout <%= proxy_read_timeout %>;
-<% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
+<% if @location_cfg_append -%><% location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
     <%= key %>         <%= value %>;
 <% end -%><% end -%>
   }

templates/vhost/vhost_location_stub_status.erb

@@ -1,7 +1,7 @@
   location <%= location %> {
-<% if @location_cfg_prepend -%><% location_cfg_prepend.each do |key,value| -%>
+<% if @location_cfg_prepend -%><% location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
     <%= key %>  <%= value %>;<% end -%><% end -%>
     stub_status on;
-<% if @location_cfg_append -%><% location_cfg_append.each do |key,value| -%>
+<% if @location_cfg_append -%><% location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
     <%= key %>  <%= value %>;<% end -%><% end -%>
   }