diff --git a/ubuntu/deirdre.asininetech.net.yml b/ubuntu/deirdre.asininetech.net.yml index 375c139..6e22301 100644 --- a/ubuntu/deirdre.asininetech.net.yml +++ b/ubuntu/deirdre.asininetech.net.yml @@ -14,34 +14,16 @@ - listen *:80 - listen [::]:80 - server_name munin.tenforward.social - - location /.well-known/acme-challenge/ { - root /var/www/html; - allow all; - } - return 301 "https://$host$request_uri" munin.tenforward.social.https: - listen *:443 ssl http2 - listen [::]:443 ssl http2 - server_name munin.tenforward.social + - root "/var/cache/munin/www" - access_log "/var/log/nginx/munin.tenforward.social.access.log" - error_log "/var/log/nginx/munin.tenforward.social.error.log" - ssl_certificate "/etc/ssl/letsencrypt/munin.tenforward.social.crt" - ssl_certificate_key "/etc/ssl/letsencrypt/munin.tenforward.social.pem" - - location ^~ /munin-cgi/munin-cgi-graph/ { - fastcgi_split_path_info ^(/munin-cgi/munin-cgi-graph)(.*); - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_pass unix:/var/run/munin/fastcgi-graph.sock; - include fastcgi_params; - } - - location /munin/static/ { - alias /etc/munin/static/; - } - - location /munin/ { - fastcgi_split_path_info ^(/munin)(.*); - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_pass unix:/var/run/munin/fastcgi-html.sock; - include fastcgi_params; - } tenforward.social.http: - listen *:80 - listen [::]:80