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

suite

Browse Source
This commit is contained in:
Nicolas Bally 2018-08-11 14:17:32 +02:00
parent f5f5aa0334
commit a578db5c5d
1 changed files with 7 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
config/nginx.conf
View File

@ -2,30 +2,6 @@ upstream sideplace_app_unicorn {
server unix:/srv/www/web/sideplace_app/shared/tmp/unicorn.sock fail_timeout=0; server unix:/srv/www/web/sideplace_app/shared/tmp/unicorn.sock fail_timeout=0;
} }
server {
listen [::]:80;
server_name sideplace.quartz.xyz sideplace.com ;
root /srv/www/web/sideplace_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://sideplace_app_unicorn;
proxy_read_timeout 6000;
}
error_page 500 502 503 504 /500.html;
client_max_body_size 4G;
keepalive_timeout 10;
include snippets/letsencrypt.conf;
}
server { server {
listen [::]:80; listen [::]:80;
server_name blog.sideplace.com affiliation-sideplace.com affiliation.sideplace.com; server_name blog.sideplace.com affiliation-sideplace.com affiliation.sideplace.com;
@ -47,11 +23,13 @@ server {
include snippets/letsencrypt.conf; include snippets/letsencrypt.conf;
} }
#server { server {
# listen 80; listen [::]:80;
#server_name sideplace.com www.sideplace.com sideplace.bally.me tmp.sideplace.com ; server_name sideplace.com www.sideplace.com sideplace.bally.me tmp.sideplace.com ;
#rewrite ^(.*) https://sideplace.com$1 permanent;
#} return 301 https://sideplace.com$request_uri;
}
server { server {