From dd4f31e6a43f3a261d51f1459501ccb09d180bc7 Mon Sep 17 00:00:00 2001 From: msnie Date: Mon, 3 Feb 2025 10:19:35 +0100 Subject: [PATCH] mastodon --- mastodon/.env.production | 34 +++------------------------------- mastodon/docker-compose.yml | 4 ++-- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/mastodon/.env.production b/mastodon/.env.production index c98f871..f78bf4b 100644 --- a/mastodon/.env.production +++ b/mastodon/.env.production @@ -1,9 +1,7 @@ -# LOCAL_DOMAIN=kvist.knast.cc -# DOMAIN_NAME=knast.cc -# WEB_DOMAIN=kvist.knast.cc LOCAL_DOMAIN=knast.cc WEB_DOMAIN=kvist.knast.cc -DEFAULT_NETWORK=traefik +#DEFAULT_NETWORK=traefik + # Redis # ----- REDIS_HOST=redis @@ -21,7 +19,7 @@ DB_PASS= -NO_CHOWN=false +#NO_CHOWN=false # Secrets # ------- # Generate each with the `RAILS_ENV=production bundle exec rake secret` task (`docker-compose run --rm web bundle exec rake secret` if you use docker compose) @@ -72,29 +70,3 @@ IP_RETENTION_PERIOD=31556952 SESSION_RETENTION_PERIOD=31556952 - -# LOCAL_DOMAIN=knast.cc -# SINGLE_USER_MODE=false -# SECRET_KEY_BASE=7a9460bb531961c4b3eb4ef00942bab7f9af218d3867f47e5da51b6c707da4781b08db278f79c7383b0a6bf20317877bb72f5516b1347ed4d8b9feba8f16b83d -# OTP_SECRET=abc17afe26fb72323073413b142d82e30c40643b09b202552e9ee0422708b9dbf7300ba561b06eab31b56ed2c6508229338fb914268e45027dffb3d0ab83142e -# ACTIVE_RECORD_ENCRYPTION_DETERMINISTIC_KEY=yl9EZMMokBmQdwqbbDIp7vttEOpBirks -# ACTIVE_RECORD_ENCRYPTION_KEY_DERIVATION_SALT=aLBt84pULNQr1C1B2RJXWgj415PADNaQ -# ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY=u7DB6BEIoOAkrAtM11HQyqpxJatwwOdv -# VAPID_PRIVATE_KEY=tIB5Jt9LyvopqE9tOxOXi-3tFo07dsZw-uSyIjXTU_w= -# VAPID_PUBLIC_KEY=BItV58p_YU4fbBAEdKrA5jX_mw2a9kWt2rnJ6p6my9Mu4Js2bfFu5a0YNTUtsUW6cgxCA4JKrFTtZP0wTeinaGQ= -# DB_HOST=db -# DB_PORT=5432 -# DB_NAME=postgres -# DB_USER=postgres -# DB_PASS= -# REDIS_HOST=redis -# REDIS_PORT=6379 -# REDIS_PASSWORD= -# SMTP_SERVER=smtp.mailgun.org -# SMTP_PORT=587 -# SMTP_LOGIN= -# SMTP_PASSWORD= -# SMTP_AUTH_METHOD=plain -# SMTP_OPENSSL_VERIFY_MODE=none -# SMTP_ENABLE_STARTTLS=auto -# SMTP_FROM_ADDRESS=Mastodon diff --git a/mastodon/docker-compose.yml b/mastodon/docker-compose.yml index f22d4ed..08f7da8 100644 --- a/mastodon/docker-compose.yml +++ b/mastodon/docker-compose.yml @@ -43,7 +43,7 @@ services: - db - redis volumes: - - /srv/mastodon/web/system:/mastodon/public/system + - /srv/mastodon/web:/mastodon/public/system labels: - traefik.enable=true - "traefik.http.routers.mastodon.entrypoints=websecure" @@ -90,7 +90,7 @@ services: - traefik - internal_network volumes: - - /srv/mastodon/web/system:/mastodon/public/system + - /srv/mastodon/web:/mastodon/public/system healthcheck: test: ['CMD-SHELL', "ps aux | grep '[s]idekiq\ 6' || false"]