Fix syntax "each" for ruby1.9 => each_line

templates/vhost/vhost_footer.erb

@@ -1,14 +1,14 @@
-<% if @include_files %><% @include_files.each do |file| -%>
+<% if @include_files %><% @include_files.each_line do |file| -%>
 include <%= file %>;
 <% end -%><% end -%>
-<% if @vhost_cfg_append -%><% vhost_cfg_append.each do |key,value| -%>
+<% if @vhost_cfg_append -%><% vhost_cfg_append.each_line do |key,value| -%>
   <%= key %> <%= value %>;
 <% end -%>
 <% end -%>
 }
 <% if @rewrite_www_to_non_www -%>
 server {
-  listen                <%= @listen_ip %>;
+  listen                <%= @listen_ip %>:<%= @listen_port %>;
   server_name           www.<%= @name.gsub(/^www\./, '') %>;
   rewrite               ^ http://<%= @name.gsub(/^www\./, '') %>$uri permanent;
 }

templates/vhost/vhost_header.erb

@@ -11,7 +11,7 @@ server {
 <% if defined? auth_basic_user_file -%>
   auth_basic_user_file <%= @auth_basic_user_file %>;
 <% end -%>
-<% @proxy_set_header.each do |header| -%>
+<% @proxy_set_header.each_line do |header| -%>
   proxy_set_header        <%= header %>;
 <% end -%>
 <% if @rewrite_to_https -%>

templates/vhost/vhost_location_alias.erb

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

templates/vhost/vhost_location_directory.erb

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

templates/vhost/vhost_location_empty.erb

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

templates/vhost/vhost_location_fastcgi.erb

@@ -1,5 +1,5 @@
   location <%= @location %> {
-<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each do |key,value| -%>
+<% if @location_cfg_prepend -%><% @location_cfg_prepend.sort_by {|k,v| k}.each_line do |key,value| -%>
     <%= key %>         <%= value %>;
 <% end -%><% end -%>
 <% if defined? @www_root -%>
@@ -9,14 +9,14 @@
     fastcgi_split_path_info <%= @fastcgi_split_path %>;
 <% end -%>
 <% if @try_files -%>
-    try_files <% @try_files.each do |try| -%> <%= try %> <% end -%>;
+    try_files <% @try_files.each_line do |try| -%> <%= try %> <% end -%>;
 <% end -%>
     include <%= @fastcgi_params %>;
     fastcgi_pass <%= @fastcgi %>;
 <% if defined? @fastcgi_script %>
     fastcgi_param SCRIPT_FILENAME <%= @fastcgi_script %>;
 <% end -%>
-<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each do |key,value| -%>
+<% if @location_cfg_append -%><% @location_cfg_append.sort_by {|k,v| k}.each_line do |key,value| -%>
     <%= key %> <%= value %>;
 <% end -%><% end -%>
   }

templates/vhost/vhost_location_proxy.erb

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

templates/vhost/vhost_location_stub_status.erb

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