Merge pull request #27 from hubspotdevops/sorted_hash

Ensure consistent printing of hash members in templates

Author: tmclaugh

templates/vhost/vhost_footer.erb

@@ -2,7 +2,7 @@
 include <%= file %>;
 <% end -%><% end -%>
 
-<% if @vhost_cfg_append -%><% vhost_cfg_append.each do |key,value| -%>
+<% if @vhost_cfg_append -%><% vhost_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
  <%= key %> <%= value %><% if key[-1,1] != '}' %>;<% end %>
 <% end -%><% end -%>
 

templates/vhost/vhost_header.erb

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

templates/vhost/vhost_ssl_header.erb

@@ -1,5 +1,5 @@
 server {
-<% if @ssl_cfg_prepend -%><% ssl_cfg_prepend.each do |key,value| -%>
+<% if @ssl_cfg_prepend -%><% ssl_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
  <%= key %> <%= value %>;
 <% end -%><% end -%>
  listen <%= listen_ip %>:<%= ssl_port %><% if scope.lookupvar('nginx::params::nx_spdy') == 'on' %> ssl spdy<% end %> <% if @listen_options %><%= listen_options %><% end %>;