Skip to content
Browse files

nginx: minor fixes

  • Loading branch information...
1 parent 9f04beb commit fd9fc73f5c5c3804eb83f7b8d3c5473ecab2e3f2 @daks committed Feb 19, 2012
Showing with 4 additions and 12 deletions.
  1. +4 −12 nginx/templates/proxy.erb
View
16 nginx/templates/proxy.erb
@@ -8,8 +8,7 @@
<% upstreams.each_pair do |server_name, upstream_servers| %>
upstream <%= server_name %> {<% upstream_servers.each do |upstream_server| %>
server <%= upstream_server %>;<% end %>
-}
-<% end %>
+}<% end %>
server {
listen <%= define_port %>;
@@ -18,9 +17,7 @@ server {
access_log /var/log/nginx/<%= server_name %>.access.log;
error_log /var/log/nginx/<%= server_name %>.error.log;
- <% if root_dir != '' %>
- root <%= root_dir %>;
- <% end %>
+ <% if root_dir != '' %>root <%= root_dir %>;<% end %>
<% if standard_location_block != '' %>
location / {
@@ -29,15 +26,10 @@ server {
proxy_redirect off;
if (!-f $request_filename) {
proxy_pass http://<%= standard_location_block %>;
- break;
}
- }
- <% end %>
-
+ }<% end %>
<% location_blocks.each_pair do |url, content| %>
location <%= url %> {
<%= content %>
- }
- <% end %>
-
+ }<% end %>
}

0 comments on commit fd9fc73

Please sign in to comment.
Something went wrong with that request. Please try again.