ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into menu-tabs

Browse Source
This commit is contained in:
ntr
2019-09-03 17:02:18 +10:00
parent f43b9f6cc3 31f353153b
commit b8c1380f88
18 changed files with 70 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
-1
View File
@@ -6,7 +6,6 @@ upstream mnml_ws {
server 127.0.0.1:40055;
}
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
etc/nginx/sites-available/mnml.gg.STAGING.SAMPLE.nginx.conf
+4 -3
View File
@@ -12,8 +12,9 @@ map $http_upgrade $connection_upgrade {
'' close;
}
# DEV
server {
server_name sixtysix.pro;
location / {
root /var/lib/mnml/public/current;
index index.html;
@@ -40,8 +41,8 @@ server {
listen [::]:443 ssl ipv6only=on; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/mnml.gg/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/mnml.gg/privkey.pem; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/sixtysix.pro/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/sixtysix.pro/privkey.pem; # managed by Certbot
include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
}