atomaka/my-boxen
1
0
Fork 0
Code Releases Activity

Merge pull request #327 from pcasaretto/silence-warnings

Browse source 
Change nginx.conf.erb to silence warnings
This commit is contained in:
Adam Ochonicki 2013-07-03 08:55:37 -07:00
commit 74e896803c
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/projects/templates/shared/nginx.conf.erb
View file

@ -1,19 +1,19 @@
upstream <%= server_name %> {
server unix:<%= scope.lookupvar "boxen::config::socketdir" %>/<%= name %>;
upstream <%= @server_name %> {
server unix:<%= scope.lookupvar "boxen::config::socketdir" %>/<%= @name %>;
}
server {
access_log <%= scope.lookupvar "nginx::config::logdir" %>/<%= name %>.access.log main;
access_log <%= scope.lookupvar "nginx::config::logdir" %>/<%= @name %>.access.log main;
listen 80;
root <%= scope.lookupvar "boxen::config::srcdir" %>/<%= name %>/public;
server_name <%= server_name %>;
root <%= scope.lookupvar "boxen::config::srcdir" %>/<%= @name %>/public;
server_name <%= @server_name %>;
client_max_body_size 50M;
error_page 500 502 503 504 /50x.html;
if ($host ~* "www") {
rewrite ^(.*)$ http://<%= server_name %>$1 permanent;
rewrite ^(.*)$ http://<%= @server_name %>$1 permanent;
break;
}
@ -31,7 +31,7 @@ server {
}
if (!-f $request_filename) {
proxy_pass http://<%= server_name %>;
proxy_pass http://<%= @server_name %>;
break;
}
}