Add wiki.ert.space; fix newlines for all files.

This commit is contained in:
Jonathan Chan 2020-05-05 22:43:27 -07:00
parent 388dadec96
commit b32aa27f17
11 changed files with 61 additions and 45 deletions

View File

@ -26,7 +26,6 @@ server {
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
}
server {
@ -34,12 +33,10 @@ server {
return 301 https://$host$request_uri;
} # managed by Certbot
listen 80;
listen [::]:80;
server_name al.ert.space;
return 404; # managed by Certbot
}

View File

@ -1,6 +1,6 @@
upstream fw {
# depending on your setup, you may want to update this
server 0.0.0.0:5678;
server 0.0.0.0:5000;
}
map $http_upgrade $connection_upgrade {
default upgrade;
@ -25,21 +25,16 @@ server {
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
}
server {
if ($host = conc.ert.space) {
return 301 https://$host$request_uri;
} # managed by Certbot
listen 80;
listen [::]:80;
server_name conc.ert.space;
return 404; # managed by Certbot
}

View File

@ -4,6 +4,7 @@ server {
location / {
try_files $uri $uri/ =404;
}
server_name ert.space;
listen [::]:443 ssl ipv6only=on; # managed by Certbot
listen 443 ssl; # managed by Certbot
@ -19,11 +20,11 @@ server {
return 301 https://$host$request_uri;
} # managed by Certbot
server_name ert.space;
listen 80;
listen [::]:80;
server_name ert.space;
return 404; # managed by Certbot
}

View File

@ -7,6 +7,14 @@ server {
proxy_set_header X-Real-IP $remote_addr;
}
location = /.well-known/carddav {
return 301 http://localhost:8080/remote.php/dav;
}
location = /.well-known/caldav {
return 301 http://localhost:8080/remote.php/dav;
}
server_name ex.ert.space;
listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
@ -21,11 +29,11 @@ server {
return 301 https://$host$request_uri;
} # managed by Certbot
server_name ex.ert.space;
listen 80;
listen [::]:80;
server_name ex.ert.space;
return 404; # managed by Certbot
}

View File

@ -5,6 +5,7 @@ server {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
server_name gitb.ert.space;
listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
@ -12,7 +13,6 @@ server {
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
}
server {
@ -20,11 +20,11 @@ server {
return 301 https://$host$request_uri;
} # managed by Certbot
server_name gitb.ert.space;
listen 80;
listen [::]:80;
server_name gitb.ert.space;
return 404; # managed by Certbot
}

View File

@ -1,11 +1,11 @@
server {
server_name hilb.ert.space;
client_max_body_size 5M;
root /srv/www/hilb.ert.space;
location / {
proxy_pass http://localhost:2368;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
try_files $uri $uri/ =404;
}
server_name hilb.ert.space;
listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
@ -13,7 +13,6 @@ server {
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
}
server {
@ -21,11 +20,11 @@ server {
return 301 https://$host$request_uri;
} # managed by Certbot
server_name hilb.ert.space;
listen 80;
listen [::]:80;
server_name hilb.ert.space;
return 404; # managed by Certbot
}

View File

@ -12,7 +12,6 @@ server {
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
}
server {
@ -20,12 +19,9 @@ server {
return 301 https://$host$request_uri;
} # managed by Certbot
listen 80;
listen [::]:80;
server_name in.ert.space;
return 404; # managed by Certbot
}

View File

@ -8,11 +8,10 @@ server {
listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/ert.space/privkey.pem; # managed by Certbot
}
server {
@ -25,6 +24,5 @@ server {
listen [::]:80;
server_name pix.ert.space;
return 404; # managed by Certbot
}

View File

@ -5,6 +5,7 @@ server {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
server_name ress.ert.space;
listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
@ -12,19 +13,17 @@ server {
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
}
server {
if ($host = ress.ert.space) {
return 301 https://$host$request_uri;
} # managed by Certbot
server_name ress.ert.space;
listen 80;
listen [::]:80;
server_name ress.ert.space;
return 404; # managed by Certbot
}

View File

@ -12,7 +12,6 @@ server {
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
}
server {
@ -20,11 +19,8 @@ server {
return 301 https://$host$request_uri;
} # managed by Certbot
listen 80;
listen [::]:80;
server_name stand.ert.space;
return 404; # managed by Certbot
}

27
wiki.ert.space Normal file
View File

@ -0,0 +1,27 @@
server {
server_name wiki.ert.space;
location / {
proxy_pass https://ionchypedia.readthedocs.io:443;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
listen [::]:443 ssl; # managed by Certbot
listen 443 ssl; # managed by Certbot
ssl_certificate /etc/letsencrypt/live/ert.space/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/ert.space/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
}
server {
if ($host = wiki.ert.space) {
return 301 https://$host$request_uri;
} # managed by Certbot
listen 80;
listen [::]:80;
server_name wiki.ert.space;
return 404; # managed by Certbot
}