sunoru/hub.moon.moe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to v4.3.1.

Browse source
This commit is contained in:
Sunoru 2024-11-10 23:06:36 +00:00
parent 5b9d11aab1
commit ed8d92afb6
Signed by: sunoru
GPG key ID: 442B84461FD0355A
5 changed files with 55 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
.env.production
View file

Binary file not shown.

2
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ghcr.io/mastodon/mastodon:v4.2.12 FROM ghcr.io/mastodon/mastodon:v4.3.1
USER root USER root

5
docker-compose.yml
View file

@ -50,7 +50,7 @@ services:
streaming: streaming:
container_name: mastodon-streaming container_name: mastodon-streaming
build: . image: ghcr.io/mastodon/mastodon-streaming:v4.3.1
restart: always restart: always
mem_limit: 128mb mem_limit: 128mb
env_file: .env.production env_file: .env.production
@ -65,8 +65,6 @@ services:
test: test:
- CMD-SHELL - CMD-SHELL
- wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1 - wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1
volumes:
- ./mastodon:/opt/my-mastodon
sidekiq: sidekiq:
container_name: mastodon-sidekiq container_name: mastodon-sidekiq
@ -95,6 +93,7 @@ services:
mem_limit: 64mb mem_limit: 64mb
depends_on: depends_on:
- web - web
- streaming
networks: networks:
- external_network - external_network
- internal_network - internal_network

2
mastodon

@ -1 +1 @@
Subproject commit 8034531b3c982149aa1b16dafd9228338f1a9592 Subproject commit a2000ad4f153d37017a41f38ae8c0d6cc2c0e72a

102
nginx/conf.d/hub.moon.moe.conf
View file

@ -38,66 +38,66 @@ server {
try_files $uri @proxy; try_files $uri @proxy;
} }
location /api/v2/media { # location /api/v2/media {
proxy_read_timeout 500; # proxy_read_timeout 500;
client_max_body_size 2g; # client_max_body_size 2g;
try_files $uri @proxy; # try_files $uri @proxy;
} # }
location = /sw.js { # location = /sw.js {
add_header Cache-Control "public, max-age=604800, must-revalidate"; # add_header Cache-Control "public, max-age=604800, must-revalidate";
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
try_files $uri =404; # try_files $uri =404;
} # }
location ~ ^/assets/ { # location ~ ^/assets/ {
add_header Cache-Control "public, max-age=2419200, must-revalidate"; # add_header Cache-Control "public, max-age=2419200, must-revalidate";
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
try_files $uri =404; # try_files $uri =404;
} # }
location ~ ^/avatars/ { # location ~ ^/avatars/ {
add_header Cache-Control "public, max-age=2419200, must-revalidate"; # add_header Cache-Control "public, max-age=2419200, must-revalidate";
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
try_files $uri =404; # try_files $uri =404;
} # }
location ~ ^/emoji/ { # location ~ ^/emoji/ {
add_header Cache-Control "public, max-age=2419200, must-revalidate"; # add_header Cache-Control "public, max-age=2419200, must-revalidate";
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
try_files $uri =404; # try_files $uri =404;
} # }
location ~ ^/headers/ { # location ~ ^/headers/ {
add_header Cache-Control "public, max-age=2419200, must-revalidate"; # add_header Cache-Control "public, max-age=2419200, must-revalidate";
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
try_files $uri =404; # try_files $uri =404;
} # }
location ~ ^/packs/ { # location ~ ^/packs/ {
add_header Cache-Control "public, max-age=2419200, must-revalidate"; # add_header Cache-Control "public, max-age=2419200, must-revalidate";
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
try_files $uri =404; # try_files $uri =404;
} # }
location ~ ^/shortcuts/ { # location ~ ^/shortcuts/ {
add_header Cache-Control "public, max-age=2419200, must-revalidate"; # add_header Cache-Control "public, max-age=2419200, must-revalidate";
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
try_files $uri =404; # try_files $uri =404;
} # }
location ~ ^/sounds/ { # location ~ ^/sounds/ {
add_header Cache-Control "public, max-age=2419200, must-revalidate"; add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Cache-Control "public, max-age=2419200, must-revalidate"; add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
try_files $uri =404; # try_files $uri =404;
} # }
location ~ ^/system/ { # location ~ ^/system/ {
add_header Cache-Control "public, max-age=2419200, immutable"; # add_header Cache-Control "public, max-age=2419200, immutable";
add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains";
add_header X-Content-Type-Options nosniff; # add_header X-Content-Type-Options nosniff;
add_header Content-Security-Policy "default-src 'none'; form-action 'none'"; # add_header Content-Security-Policy "default-src 'none'; form-action 'none'";
try_files $uri =404; # try_files $uri =404;
} # }
location ^~ /api/v1/streaming { location ^~ /api/v1/streaming {
proxy_set_header Host $host; proxy_set_header Host $host;