nicolas/ballalama3_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nginx

Browse Source
This commit is contained in:
Nicolas Bally 2017-01-23 18:03:25 +01:00
parent 7fb43df8ee
commit bbed00e5bc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/nginx.conf
View File

@ -4,7 +4,7 @@ upstream ballalama3_app_unicorn {
server { server {
listen 80; listen 80;
server_name ballalama3.quartz.xyz; server_name ballalama.com;
root /home/web/ballalama3_app/current/public; root /home/web/ballalama3_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -20,10 +20,9 @@ server {
keepalive_timeout 10; keepalive_timeout 10;
} }
server { server {
listen 80; listen 80;
server_name www.ballalama3.quartz.xyz ; server_name ballalama.com ballalama3.quartz.xyz;
rewrite ^(.*) http://ballalama3.quartz.xyz$1 permanent; rewrite ^(.*) http://www.ballalama.com$1 permanent;
} }