Merge 60c2ad4b59cb1dcc0f2b8d7f1928716572befa60 into 6d019fa4bf1fa2f51ecc344d1119adfd24840468

This commit is contained in:
Eric Nemchik 2026-03-13 06:35:09 +00:00 committed by GitHub
commit 70d876b5ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 6 deletions

View File

@ -174,6 +174,7 @@ init_diagram: |
"mastodon:glitch" <- Base Images
# changelog
changelogs:
- {date: "08.02.26:", desc: "Existing users should update: site-confs/default.conf - Deny access to all dotfiles."}
- {date: "21.10.25:", desc: "Add prometheus exporter support."}
- {date: "20.10.25:", desc: "Add vips-heif."}
- {date: "09.07.25:", desc: "Rebase to Alpine 3.22."}

View File

@ -1,8 +1,8 @@
## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-mastodon/commits/glitch/root/defaults/nginx/site-confs/default.conf.sample
## Version 2026/02/08 - Changelog: https://github.com/linuxserver/docker-mastodon/commits/glitch/root/defaults/nginx/site-confs/default.conf.sample
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
'' close;
}
upstream backend {
@ -16,8 +16,12 @@ upstream streaming {
proxy_cache_path /var/cache/nginx levels=1:2 keys_zone=CACHE:10m inactive=7d max_size=1g;
server {
listen *:80 default_server;
listen *:443 ssl default_server;
listen 80 default_server;
listen [::]:80 default_server;
listen 443 ssl default_server;
listen [::]:443 ssl default_server;
listen 443 quic reuseport default_server;
listen [::]:443 quic reuseport default_server;
server_name _;
@ -139,9 +143,16 @@ server {
error_page 404 500 501 502 503 504 /500.html;
# deny access to .htaccess/.htpasswd files
location ~ /\.ht {
# deny access to all dotfiles
location ~ /\. {
deny all;
log_not_found off;
access_log off;
return 404;
}
# Allow access to the ".well-known" directory
location ^~ /.well-known {
allow all;
}
}