Merge remote-tracking branch 'origin/patch-1'

* origin/patch-1:
  Update vhost_ssl_header.erb
This commit is contained in:
Chris Denneen 2014-02-07 18:43:41 -05:00
commit 7a83b0ebf2

View file

@ -47,7 +47,13 @@ server {
access_log <%= @ssl_access_log %>;
error_log <%= @ssl_error_log %>;
<% if @vhost_cfg_prepend -%><% @vhost_cfg_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
<%= key %> <%= value %>;
<% end -%><% end -%>
<% if @vhost_cfg_ssl_prepend -%><% @vhost_cfg_ssl_prepend.sort_by{ |k, v| k.to_s == 'allow' ? '' : k.to_s }.each do |key,value| -%>
<%= key %> <%= value %>;
<% end -%><% end -%>
<% if @root -%>
root <%= @root %>;
<% end -%>