diff --git a/.env.production b/.env.production index 136fec1..a1942e4 100644 Binary files a/.env.production and b/.env.production differ diff --git a/Dockerfile b/Dockerfile index 4b7ce3d..30771f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/mastodon/mastodon:v4.2.12 +FROM ghcr.io/mastodon/mastodon:v4.3.1 USER root diff --git a/docker-compose.yml b/docker-compose.yml index 4423116..cc01769 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -50,7 +50,7 @@ services: streaming: container_name: mastodon-streaming - build: . + image: ghcr.io/mastodon/mastodon-streaming:v4.3.1 restart: always mem_limit: 128mb env_file: .env.production @@ -65,8 +65,6 @@ services: test: - CMD-SHELL - wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1 - volumes: - - ./mastodon:/opt/my-mastodon sidekiq: container_name: mastodon-sidekiq @@ -95,6 +93,7 @@ services: mem_limit: 64mb depends_on: - web + - streaming networks: - external_network - internal_network diff --git a/mastodon b/mastodon index 8034531..a2000ad 160000 --- a/mastodon +++ b/mastodon @@ -1 +1 @@ -Subproject commit 8034531b3c982149aa1b16dafd9228338f1a9592 +Subproject commit a2000ad4f153d37017a41f38ae8c0d6cc2c0e72a diff --git a/nginx/conf.d/hub.moon.moe.conf b/nginx/conf.d/hub.moon.moe.conf index b9ed859..b65de1b 100644 --- a/nginx/conf.d/hub.moon.moe.conf +++ b/nginx/conf.d/hub.moon.moe.conf @@ -38,66 +38,66 @@ server { try_files $uri @proxy; } - location /api/v2/media { - proxy_read_timeout 500; - client_max_body_size 2g; - try_files $uri @proxy; - } + # location /api/v2/media { + # proxy_read_timeout 500; + # client_max_body_size 2g; + # try_files $uri @proxy; + # } - location = /sw.js { - add_header Cache-Control "public, max-age=604800, must-revalidate"; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - try_files $uri =404; - } + # location = /sw.js { + # add_header Cache-Control "public, max-age=604800, must-revalidate"; + # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # try_files $uri =404; + # } - location ~ ^/assets/ { - add_header Cache-Control "public, max-age=2419200, must-revalidate"; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - try_files $uri =404; - } + # location ~ ^/assets/ { + # add_header Cache-Control "public, max-age=2419200, must-revalidate"; + # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # try_files $uri =404; + # } - location ~ ^/avatars/ { - add_header Cache-Control "public, max-age=2419200, must-revalidate"; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - try_files $uri =404; - } + # location ~ ^/avatars/ { + # add_header Cache-Control "public, max-age=2419200, must-revalidate"; + # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # try_files $uri =404; + # } - location ~ ^/emoji/ { - add_header Cache-Control "public, max-age=2419200, must-revalidate"; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - try_files $uri =404; - } + # location ~ ^/emoji/ { + # add_header Cache-Control "public, max-age=2419200, must-revalidate"; + # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # try_files $uri =404; + # } - location ~ ^/headers/ { - add_header Cache-Control "public, max-age=2419200, must-revalidate"; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - try_files $uri =404; - } + # location ~ ^/headers/ { + # add_header Cache-Control "public, max-age=2419200, must-revalidate"; + # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # try_files $uri =404; + # } - location ~ ^/packs/ { - add_header Cache-Control "public, max-age=2419200, must-revalidate"; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - try_files $uri =404; - } + # location ~ ^/packs/ { + # add_header Cache-Control "public, max-age=2419200, must-revalidate"; + # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # try_files $uri =404; + # } - location ~ ^/shortcuts/ { - add_header Cache-Control "public, max-age=2419200, must-revalidate"; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - try_files $uri =404; - } + # location ~ ^/shortcuts/ { + # add_header Cache-Control "public, max-age=2419200, must-revalidate"; + # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # try_files $uri =404; + # } - location ~ ^/sounds/ { - add_header Cache-Control "public, max-age=2419200, must-revalidate"; add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - try_files $uri =404; - } + # location ~ ^/sounds/ { + # add_header Cache-Control "public, max-age=2419200, must-revalidate"; add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # try_files $uri =404; + # } - location ~ ^/system/ { - add_header Cache-Control "public, max-age=2419200, immutable"; - add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; - add_header X-Content-Type-Options nosniff; - add_header Content-Security-Policy "default-src 'none'; form-action 'none'"; - try_files $uri =404; - } + # location ~ ^/system/ { + # add_header Cache-Control "public, max-age=2419200, immutable"; + # add_header Strict-Transport-Security "max-age=63072000; includeSubDomains"; + # add_header X-Content-Type-Options nosniff; + # add_header Content-Security-Policy "default-src 'none'; form-action 'none'"; + # try_files $uri =404; + # } location ^~ /api/v1/streaming { proxy_set_header Host $host;