Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
51539de373
@ -10,7 +10,7 @@ upstream presta_app_unicorn {
|
||||
|
||||
server {
|
||||
listen [::]:443 ssl;
|
||||
server_name presta.basiclabs.fr;
|
||||
server_name arcom.basiclabs.fr;
|
||||
root /srv/www/web/presta_app/current/public;
|
||||
try_files $uri/index.html $uri @unicorn;
|
||||
|
||||
@ -36,23 +36,10 @@ server {
|
||||
keepalive_timeout 10;
|
||||
|
||||
ssl on;
|
||||
ssl_certificate /etc/letsencrypt/live/fid.olwen.xyz/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/fid.olwen.xyz/privkey.pem;
|
||||
ssl_certificate /etc/letsencrypt/live/arcom.basiclabs.fr/fullchain.pem;
|
||||
ssl_certificate_key /etc/letsencrypt/live/arcom.basiclabs.fr/privkey.pem;
|
||||
|
||||
|
||||
include snippets/letsencrypt.conf;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
server {
|
||||
listen [::]:80;
|
||||
server_name presta.basiclabs.fr;
|
||||
|
||||
return 301 https://presta.basiclabs.fr$request_uri;
|
||||
|
||||
include snippets/letsencrypt.conf;
|
||||
}
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user