diff --git a/config/nginx.conf b/config/nginx.conf index e88c870..5b7289f 100644 --- a/config/nginx.conf +++ b/config/nginx.conf @@ -1,50 +1,51 @@ upstream musifrat_app_unicorn { - server unix:/srv/www/web/musifrat_app/shared/tmp/unicorn.sock fail_timeout=0; + server unix:/srv/www/web/musifrat_app/shared/tmp/unicorn.sock fail_timeout=0; } server { - listen [::]:443 ssl; - server_name musifrat-festival.com; - root /srv/www/web/musifrat_app/current/public/@; - try_files $uri/index.html $uri @unicorn; + listen [::]:443 ssl; + server_name musifrat-festival.com; + root /srv/www/web/musifrat_app/current/public; + try_files $uri/index.html $uri @unicorn; + location @unicorn { + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header Host $http_host; + proxy_redirect off; + proxy_pass http://musifrat_app_unicorn; + proxy_read_timeout 6000; + } + + error_page 500 502 503 504 /500.html; + client_max_body_size 4G; + keepalive_timeout 10; - error_page 500 502 503 504 /500.html; - client_max_body_size 4G; - keepalive_timeout 10; - ssl on; ssl_certificate /etc/letsencrypt/live/musifrat-festival.com/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/musifrat-festival.com/privkey.pem; - - + + include snippets/letsencrypt.conf; } server { - listen [::]:80; - server_name musifrat-festival.com *.musifrat-festival.com; - + listen [::]:80; + server_name musifrat-festival.com *.musifrat-festival.com; + return 301 https://musifrat-festival.com$request_uri; - + include snippets/letsencrypt.conf; } - - - - server { - listen [::]:443 ssl; + listen [::]:443 ssl; server_name www.musifrat-festival.com; ssl on; ssl_certificate /etc/letsencrypt/live/musifrat-festival.com/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/musifrat-festival.com/privkey.pem; - + return 301 https://musifrat-festival.com$request_uri; - + include snippets/letsencrypt.conf; -} - - +} \ No newline at end of file