Merge commit '241ad1c5878161f5f4a19c16ed6c042f1c2cb6c2' into glitch-soc/merge-upstream

This commit is contained in:
Claire
2025-10-16 18:36:25 +02:00
7 changed files with 48 additions and 24 deletions

View File

@@ -115,7 +115,7 @@ services:
volumes:
- ./public/system:/mastodon/public/system
healthcheck:
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 7' || false"]
test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ [78]' || false"]
## Uncomment to enable federation with tor instances along with adding the following ENV variables
## http_hidden_proxy=http://privoxy:8118