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

Compare commits

base: nicolas:2a6fc4cce6c33ac932e114edd2c47180d105516b
Branches Tags
nicolas:master
nicolas:update-css-header-footer
..
compare: nicolas:d2d186724c995bbc53e871329b617518bc04aeba
Branches Tags
nicolas:master
nicolas:update-css-header-footer

No commits in common. "2a6fc4cce6c33ac932e114edd2c47180d105516b" and "d2d186724c995bbc53e871329b617518bc04aeba" have entirely different histories.
2a6fc4cce6 ... d2d186724c

1 changed files with 27 additions and 3 deletions
Show Stats Expand all files Collapse all files

30
config/nginx.conf
View File

@ -10,7 +10,7 @@ upstream mmsc_app_unicorn {
server { server {
listen [::]:443 ssl; listen [::]:443 ssl;
server_name oldmmsc.olwen.xyz ; server_name mamotosurcircuit.com ;
root /srv/www/web/mmsc_app/current/public; root /srv/www/web/mmsc_app/current/public;
try_files $uri/index.html $uri @unicorn; try_files $uri/index.html $uri @unicorn;
@ -36,11 +36,35 @@ server {
keepalive_timeout 10; keepalive_timeout 10;
ssl on; ssl on;
ssl_certificate /etc/letsencrypt/live/oldmmsc.olwen.xyz/fullchain.pem; ssl_certificate /etc/letsencrypt/live/mmsc.olwen.xyz/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/oldmmsc.olwen.xyz/privkey.pem; ssl_certificate_key /etc/letsencrypt/live/mmsc.olwen.xyz/privkey.pem;
include snippets/letsencrypt.conf; include snippets/letsencrypt.conf;
} }
server {
listen [::]:443 ssl;
ssl on;
ssl_certificate /etc/letsencrypt/live/mmsc.olwen.xyz/fullchain.pem;
ssl_certificate_key /etc/letsencrypt/live/mmsc.olwen.xyz/privkey.pem;
include snippets/letsencrypt.conf;
server_name www.mamotosurcircuit.com mmsc.olwen.xyz;
rewrite ^(.*) https://mamotosurcircuit.com$1 permanent;
}
server {
listen [::]:80;
server_name mmsc.olwen.xyz mamotosurcircuit.com www.mamotosurcircuit.com;
return 301 https://mamotosurcircuit.com$request_uri;
include snippets/letsencrypt.conf;
}