Compare commits

..

No commits in common. "f564d4e1452fff713f3555aa69edf66681cacc6f" and "476f8263d4b212524f7671594da8663701004b16" have entirely different histories.

2 changed files with 6 additions and 9 deletions

View file

@ -7,10 +7,11 @@ server {
} }
server { server {
# SSL configuration # SSL configuration
listen 195.113.20.177:443 ssl http2; listen 195.113.20.177:443 ssl;
listen [2001:718:1e03:801::b1]:443 ssl http2; listen [2001:718:1e03:801::b1]:443 ssl;
# SSL keys # SSL keys
ssl on;
ssl_certificate /etc/letsencrypt/live/mam-test.ks.matfyz.cz/fullchain.pem; # managed by Certbot ssl_certificate /etc/letsencrypt/live/mam-test.ks.matfyz.cz/fullchain.pem; # managed by Certbot
ssl_certificate_key /etc/letsencrypt/live/mam-test.ks.matfyz.cz/privkey.pem; # managed by Certbot ssl_certificate_key /etc/letsencrypt/live/mam-test.ks.matfyz.cz/privkey.pem; # managed by Certbot
ssl_dhparam /etc/ssl/dhparams.pem; ssl_dhparam /etc/ssl/dhparams.pem;
@ -32,10 +33,6 @@ server {
root /akce/mam/www/mamweb-test/; root /akce/mam/www/mamweb-test/;
} }
location /docs {
alias /akce/mam/www/mamweb-test/docs/_build/html/;
}
location /aesop-export/ { location /aesop-export/ {
auth_basic "AESOP API"; auth_basic "AESOP API";
auth_basic_user_file /akce/mam/www/mamweb-test/.htpasswd-aesop; auth_basic_user_file /akce/mam/www/mamweb-test/.htpasswd-aesop;

View file

@ -9,10 +9,11 @@ server {
server { server {
# SSL configuration # SSL configuration
# #
listen 195.113.20.177:443 ssl http2; listen 195.113.20.177:443 ssl;
listen [2001:718:1e03:801::b1]:443 ssl http2; listen [2001:718:1e03:801::b1]:443 ssl;
# SSL keys # SSL keys
ssl on;
ssl_certificate /etc/ssl/domains/mam.mff.cuni.cz/bundle.pem; ssl_certificate /etc/ssl/domains/mam.mff.cuni.cz/bundle.pem;
ssl_certificate_key /etc/ssl/domains/mam.mff.cuni.cz/privkey.pem; ssl_certificate_key /etc/ssl/domains/mam.mff.cuni.cz/privkey.pem;
ssl_dhparam /etc/ssl/dhparams.pem; ssl_dhparam /etc/ssl/dhparams.pem;
@ -48,7 +49,6 @@ server {
sub_filter 'href="/' 'href="/wiki/'; sub_filter 'href="/' 'href="/wiki/';
sub_filter 'src="/' 'src="/wiki/'; sub_filter 'src="/' 'src="/wiki/';
sub_filter 'action="/' 'action="/wiki/'; sub_filter 'action="/' 'action="/wiki/';
sub_filter 'diffurl="/' 'diffurl="/wiki/';
# Overkill: # Overkill:
#sub_filter '="/' '="/wiki/'; #sub_filter '="/' '="/wiki/';
#sub_filter ':5001/' '/wiki/'; #sub_filter ':5001/' '/wiki/';