From bbed00e5bc5db91ce6d26f3c9f3c75ce8078099a Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Mon, 23 Jan 2017 18:03:25 +0100 Subject: [PATCH] nginx --- config/nginx.conf | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/config/nginx.conf b/config/nginx.conf index ffccb47..2d04e3f 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -4,7 +4,7 @@ upstream ballalama3_app_unicorn { server { listen 80; - server_name ballalama3.quartz.xyz; + server_name ballalama.com; root /home/web/ballalama3_app/current/public; try_files $uri/index.html $uri @unicorn; @@ -20,10 +20,9 @@ server { keepalive_timeout 10; } + server { listen 80; - server_name www.ballalama3.quartz.xyz ; - rewrite ^(.*) http://ballalama3.quartz.xyz$1 permanent; + server_name ballalama.com ballalama3.quartz.xyz; + rewrite ^(.*) http://www.ballalama.com$1 permanent; } - -