Merge remote-tracking branch 'upstream/main' into merge-upstream

# Conflicts:
#	management/status_checks.py
#	setup/webmail.sh
This commit is contained in:
downtownallday
2024-12-22 10:22:53 -05:00
11 changed files with 128 additions and 35 deletions
-1
View File
@@ -8,7 +8,6 @@
rewrite ^/admin/munin$ /admin/munin/ redirect;
location /admin/ {
proxy_pass http://127.0.0.1:10222/;
proxy_read_timeout 600s;
proxy_set_header X-Forwarded-For $remote_addr;
add_header X-Frame-Options "DENY";
add_header X-Content-Type-Options nosniff;