lib/capistrano/recipes/templates/nginx.vhost.erb in capistrano_recipes-1.0.1 vs lib/capistrano/recipes/templates/nginx.vhost.erb in capistrano_recipes-1.0.2

- old
+ new

@@ -25,29 +25,27 @@ if (-f $document_root/system/maintenance.html) { rewrite ^(.*)$ /system/maintenance.html last; break; } - location / { - # If the file exists as a static file, serve it directly - # without running all the other rewrite tests on it - if (-f $request_filename) { - break; - } + # If the file exists as a static file, serve it directly + # without running all the other rewrite tests on it + if (-f $request_filename) { + break; + } - # Check for index.html - if (-f $request_filename/index.html) { - rewrite (.*) $1/index.html break; - } + # Check for index.html + if (-f $request_filename/index.html) { + rewrite (.*) $1/index.html break; + } - # Check if .html file exists for page caching - if (-f $request_filename.html) { - rewrite (.*) $1.html break; - } + # Check if .html file exists for page caching + if (-f $request_filename.html) { + rewrite (.*) $1.html break; } -<% if using_recipe?(:rails_assets) %> +<% if using_recipe?(:assets) %> # Asset pipeline location ^~ /assets/ { gzip_static on; expires max; add_header Cache-Control public; @@ -91,28 +89,26 @@ if (-f $document_root/system/maintenance.html) { rewrite ^(.*)$ /system/maintenance.html last; break; } - location / { - # If the file exists as a static file, serve it directly - # without running all the other rewrite tests on it - if (-f $request_filename) { - break; - } + # If the file exists as a static file, serve it directly + # without running all the other rewrite tests on it + if (-f $request_filename) { + break; + } - # Check for index.html - if (-f $request_filename/index.html) { - rewrite (.*) $1/index.html break; - } + # Check for index.html + if (-f $request_filename/index.html) { + rewrite (.*) $1/index.html break; + } - # Check if .html file exists for page caching - if (-f $request_filename.html) { - rewrite (.*) $1.html break; - } + # Check if .html file exists for page caching + if (-f $request_filename.html) { + rewrite (.*) $1.html break; } -<% if using_recipe?(:rails_assets) %> +<% if using_recipe?(:assets) %> # Asset pipeline location ^~ /assets/ { gzip_static on; expires max; add_header Cache-Control public; \ No newline at end of file