massive update i don't feel like noting what changed
This commit is contained in:
parent
0d93587aef
commit
fe7ede16c8
GPG key ID:
8ECFA045E63BC583
27 changed files with 255 additions and 118 deletions
|
|
@ -1,15 +0,0 @@
|
|||
services:
|
||||
caddy:
|
||||
image: caddy:alpine
|
||||
container_name: caddy
|
||||
restart: unless-stopped
|
||||
network_mode: host
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
volumes:
|
||||
- /etc/caddy:/etc/caddy # configurations
|
||||
- ./caddy_data:/data # internal caddy data
|
||||
- ./caddy_config:/config # ^
|
||||
- /srv/docker/mastodon/public:/srv/docker/mastodon/public # mastodon web frontend
|
||||
- /var/www:/var/www # generic web system directory
|
||||
- /var/log/caddy:/var/log/caddy # log directory
|
||||
|
|
@ -7,7 +7,7 @@ services:
|
|||
- db
|
||||
- ip6net
|
||||
ports:
|
||||
- "127.0.0.1:24042:24042"
|
||||
- "192.168.1.73:24042:24042"
|
||||
environment:
|
||||
- ICESHRIMP_CONFIG_OVERRIDES=/app/config/configuration.ini
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -39,7 +39,11 @@ FETCH_REPLIES_MAX_GLOBAL=1000
|
|||
FETCH_REPLIES_MAX_SINGLE=500
|
||||
FETCH_REPLIES_MAX_PAGES=500
|
||||
|
||||
# enable experimental quotes
|
||||
EXPERIMENTAL_FEATURES=inbound_quotes,outgoing_quotes
|
||||
|
||||
# tell federation to use more cores
|
||||
SIDEKIQ_CONCURRENCY=20
|
||||
WEB_CONCURRENCY=4
|
||||
|
||||
GITHUB_REPOSITORY=melontini/mastodon
|
||||
|
|
@ -14,7 +14,7 @@ services:
|
|||
healthcheck:
|
||||
test: ['CMD-SHELL',"curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1"]
|
||||
ports:
|
||||
- "127.0.0.1:46098:3000"
|
||||
- "192.168.1.73:46098:3000"
|
||||
depends_on:
|
||||
dragonfly:
|
||||
condition: service_healthy
|
||||
|
|
@ -36,7 +36,20 @@ services:
|
|||
healthcheck:
|
||||
test: ['CMD-SHELL', "curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1"]
|
||||
ports:
|
||||
- "127.0.0.1:58834:4000"
|
||||
- "192.168.1.73:58834:4000"
|
||||
depends_on:
|
||||
dragonfly:
|
||||
condition: service_healthy
|
||||
|
||||
ingress:
|
||||
image: ghcr.io/melontini/mastodon-ingress:nightly
|
||||
restart: always
|
||||
env_file:
|
||||
- .env.secrets
|
||||
- .env
|
||||
networks:
|
||||
- masto
|
||||
- db
|
||||
depends_on:
|
||||
dragonfly:
|
||||
condition: service_healthy
|
||||
|
|
@ -69,7 +82,7 @@ services:
|
|||
networks:
|
||||
- masto
|
||||
environment:
|
||||
# these envvars are important to make dfdb act as closely as possible to redis for properly saving and loading data
|
||||
# these envvars are important in order for dragonflydb/misskey to interact with each other properly, and to load and save all data properly
|
||||
DFLY_snapshot_cron: '* * * * *'
|
||||
DFLY_version_check: false
|
||||
DFLY_default_lua_flags: allow-undeclared-keys
|
||||
|
|
@ -129,6 +142,17 @@ services:
|
|||
interval: 5s
|
||||
retries: 20
|
||||
|
||||
# used to passthrough web files via local network
|
||||
darkhttpd:
|
||||
image: p3terx/darkhttpd
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "192.168.1.73:42261:80"
|
||||
volumes:
|
||||
- ./public/system:/mastodon/public/system
|
||||
command:
|
||||
- "/mastodon/public/system"
|
||||
|
||||
# tor is a wip - consider setting up later
|
||||
## Uncomment to enable federation with tor instances along with adding the following ENV variables
|
||||
## http_hidden_proxy=http://privoxy:8118
|
||||
|
|
|
|||
|
|
@ -10,5 +10,5 @@ PDS_BSKY_APP_VIEW_URL=https://api.bsky.app
|
|||
PDS_BSKY_APP_VIEW_DID=did:web:api.bsky.app
|
||||
PDS_REPORT_SERVICE_URL=https://mod.bsky.app
|
||||
PDS_REPORT_SERVICE_DID=did:plc:ar7c4by46qjdydhdevvrndac
|
||||
PDS_CRAWLERS=https://bsky.network
|
||||
PDS_CRAWLERS=https://bsky.network,https://relay.cerulea.blue,https://relay.fire.hose.cam,https://relay2.fire.hose.cam,https://relay3.fr.hose.cam,https://atproto.africa
|
||||
LOG_ENABLED=true
|
||||
|
|
@ -4,7 +4,7 @@ services:
|
|||
image: ghcr.io/bluesky-social/pds:latest
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "127.0.0.1:24318:3000"
|
||||
- "192.168.1.73:24318:3000"
|
||||
networks:
|
||||
- ip6net
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ services:
|
|||
- ./db:/var/lib/postgresql/data
|
||||
networks:
|
||||
- postgres_db
|
||||
# default user values
|
||||
env_file:
|
||||
- .env
|
||||
healthcheck:
|
||||
|
|
|
|||
|
|
@ -12,10 +12,10 @@
|
|||
services:
|
||||
# api obviously handles most api endpoints, as well as serving the web frontend
|
||||
api:
|
||||
image: registry.activitypub.software/transfem-org/sharkey:latest
|
||||
image: registry.activitypub.software/transfem-org/sharkey:develop
|
||||
restart: always
|
||||
ports:
|
||||
- "127.0.0.1:60628:3001"
|
||||
- "192.168.1.73:60628:3001"
|
||||
networks:
|
||||
- ip6net
|
||||
- db
|
||||
|
|
@ -34,7 +34,7 @@ services:
|
|||
|
||||
# queue/process handling. basically the actual backend
|
||||
worker:
|
||||
image: registry.activitypub.software/transfem-org/sharkey:latest
|
||||
image: registry.activitypub.software/transfem-org/sharkey:develop
|
||||
restart: always
|
||||
networks:
|
||||
- db
|
||||
|
|
@ -52,10 +52,10 @@ services:
|
|||
|
||||
# handles federation/activitypub requests
|
||||
activity:
|
||||
image: registry.activitypub.software/transfem-org/sharkey:latest
|
||||
image: registry.activitypub.software/transfem-org/sharkey:develop
|
||||
restart: always
|
||||
ports:
|
||||
- "127.0.0.1:47815:3002"
|
||||
- "192.168.1.73:47815:3002"
|
||||
networks:
|
||||
- ip6net
|
||||
- db
|
||||
|
|
@ -75,10 +75,10 @@ services:
|
|||
|
||||
# handles media/reverse proxy (/files/*)
|
||||
media:
|
||||
image: registry.activitypub.software/transfem-org/sharkey:latest
|
||||
image: registry.activitypub.software/transfem-org/sharkey:develop
|
||||
restart: always
|
||||
ports:
|
||||
- "127.0.0.1:57378:3003"
|
||||
- "192.168.1.73:57378:3003"
|
||||
networks:
|
||||
- ip6net
|
||||
- db
|
||||
|
|
@ -118,7 +118,7 @@ services:
|
|||
DFLY_dir: '/data' # directory with the snapshot/data
|
||||
volumes:
|
||||
- ./dragonfly/general:/data
|
||||
|
||||
|
||||
# job queue dfdb
|
||||
dragonfly-queue:
|
||||
image: docker.dragonflydb.io/dragonflydb/dragonfly
|
||||
|
|
|
|||
|
|
@ -101,8 +101,8 @@ db:
|
|||
|
||||
# Auth
|
||||
# You can set user and pass from environment variables instead.
|
||||
user: example-misskey-user
|
||||
pass: example-misskey-pass
|
||||
#user: example-misskey-user
|
||||
#pass: example-misskey-pass
|
||||
|
||||
## Log a warning to the server console if any query takes longer than this to complete.
|
||||
## Measured in milliseconds; set to 0 to disable. (default: 300)
|
||||
|
|
@ -309,6 +309,10 @@ maxRemoteCwLength: 5000
|
|||
maxAltTextLength: 100000
|
||||
# Amount of characters that will be saved for remote media descriptions (alt text). Longer descriptions will be truncated to this length. (minimum: 1)
|
||||
maxRemoteAltTextLength: 100000
|
||||
# Amount of characters that can be used when writing user bios. Longer descriptions will be rejected. (minimum: 1)
|
||||
maxBioLength: 2048
|
||||
# Amount of characters that will be saved for remote user bios. Longer descriptions will be truncated to this length. (minimum: 1)
|
||||
maxRemoteBioLength: 10000
|
||||
|
||||
# Proxy for HTTP/HTTPS
|
||||
#proxy: http://127.0.0.1:3128
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue