Sort sub hash keys to have a stable ordering

templates/vhost/location_footer.erb

@@ -1,7 +1,7 @@
 <% if @location_cfg_append -%>
   <%- @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
     <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>
@@ -16,7 +16,7 @@
 <% if @location_custom_cfg_append -%>
   <%- @location_custom_cfg_append.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
     <%= key %> <%= subkey %> <%= asubvalue %>
         <%- end -%>

templates/vhost/location_header.erb

@@ -22,7 +22,7 @@
 <% if @location_custom_cfg_prepend -%>
   <%- @location_custom_cfg_prepend.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
     <%= key %> <%= subkey %> <%= asubvalue %>
         <%- end -%>
@@ -37,7 +37,7 @@
 <% if @location_cfg_prepend -%>
   <%- @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
     <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>

templates/vhost/locations/empty.erb

@@ -1,7 +1,7 @@
 <% if @location_custom_cfg -%>
   <%- @location_custom_cfg.sort_by {|k,v| k}.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
     <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>

templates/vhost/vhost_footer.erb

@@ -9,7 +9,7 @@
 <% if @vhost_cfg_append -%>
   <%- @vhost_cfg_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
   <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>

templates/vhost/vhost_header.erb

@@ -43,7 +43,7 @@ server {
 <% if @vhost_cfg_prepend -%>
   <%- @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
   <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>

templates/vhost/vhost_ssl_footer.erb

@@ -6,7 +6,7 @@
 <% if @vhost_cfg_append -%>
   <%- @vhost_cfg_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by{ |k, v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
   <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>
@@ -21,7 +21,7 @@
 <% if @vhost_cfg_ssl_append -%>
   <%- @vhost_cfg_ssl_append.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by{ |k, v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
   <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>

templates/vhost/vhost_ssl_header.erb

@@ -80,7 +80,7 @@ server {
 <% if @vhost_cfg_prepend -%>
   <%- @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
   <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>
@@ -95,7 +95,7 @@ server {
 <% if @vhost_cfg_ssl_prepend -%>
   <%- @vhost_cfg_ssl_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
     <%- if value.is_a?(Hash) -%>
-      <%- value.each do |subkey,subvalue| -%>
+      <%- value.sort_by {|k,v| k}.each do |subkey,subvalue| -%>
         <%- Array(subvalue).each do |asubvalue| -%>
   <%= key %> <%= subkey %> <%= asubvalue %>;
         <%- end -%>