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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Barnabé 2021-09-27 16:58:43 +02:00
commit 51539de373
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
config/nginx.conf
View File

@ -10,7 +10,7 @@ upstream presta_app_unicorn {
server { server {
listen [::]:443 ssl; listen [::]:443 ssl;
server_name presta.basiclabs.fr; server_name arcom.basiclabs.fr;
root /srv/www/web/presta_app/current/public; root /srv/www/web/presta_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -36,23 +36,10 @@ server {
keepalive_timeout 10; keepalive_timeout 10;
ssl on; ssl on;
ssl_certificate /etc/letsencrypt/live/fid.olwen.xyz/fullchain.pem; ssl_certificate /etc/letsencrypt/live/arcom.basiclabs.fr/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/fid.olwen.xyz/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/arcom.basiclabs.fr/privkey.pem;
include snippets/letsencrypt.conf; include snippets/letsencrypt.conf;
} }
server {
listen [::]:80;
server_name presta.basiclabs.fr;
return 301 https://presta.basiclabs.fr$request_uri;
include snippets/letsencrypt.conf;
}