Skip to content

Commit

Permalink
Merge pull request #121 from abraham1901/master
Browse files Browse the repository at this point in the history
* Bug fix, remove each_line method
  • Loading branch information
James Fryman committed Aug 25, 2013
2 parents d1aef6e + 1efc72b commit f8642b3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions templates/vhost/vhost_footer.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<% if @include_files %><% @include_files.each_line do |file| -%>
<% if @include_files %><% @include_files.each do |file| -%>
include <%= file %>;
<% end -%><% end -%>
<% if @vhost_cfg_append -%><% vhost_cfg_append.each_line do |key,value| -%>
<% if @vhost_cfg_append -%><% vhost_cfg_append.each do |key,value| -%>
<%= key %> <%= value %>;
<% end -%>
<% end -%>
Expand Down
2 changes: 1 addition & 1 deletion templates/vhost/vhost_header.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ server {
<% if defined? auth_basic_user_file -%>
auth_basic_user_file <%= @auth_basic_user_file %>;
<% end -%>
<% @proxy_set_header.each_line do |header| -%>
<% @proxy_set_header.each do |header| -%>
proxy_set_header <%= header %>;
<% end -%>
<% if @rewrite_to_https -%>
Expand Down
4 changes: 2 additions & 2 deletions templates/vhost/vhost_location_directory.erb
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
root <%= @www_root %>;
<% end -%>
<% if @try_files -%>
try_files <% @try_files.each_line do |try| -%> <%= try %> <% end -%>;
try_files <% @try_files.each do |try| -%> <%= try %> <% end -%>;
<% end -%>
<% if @index_files -%>
index <% @index_files.each_line do |i| %> <%= i %><% end %>;
index <% @index_files.each do |i| %> <%= i %><% end %>;
<% end -%>
<% if defined? auth_basic -%>
auth_basic "<%= @auth_basic %>";
Expand Down
2 changes: 1 addition & 1 deletion templates/vhost/vhost_location_fastcgi.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
fastcgi_split_path_info <%= @fastcgi_split_path %>;
<% end -%>
<% if @try_files -%>
try_files <% @try_files.each_line do |try| -%> <%= try %> <% end -%>;
try_files <% @try_files.each do |try| -%> <%= try %> <% end -%>;
<% end -%>
include <%= @fastcgi_params %>;
fastcgi_pass <%= @fastcgi %>;
Expand Down

0 comments on commit f8642b3

Please sign in to comment.