From aa0cfb46c8847801af08c8905bdf9aa8b281f448 Mon Sep 17 00:00:00 2001 From: Raine Date: Sat, 25 Nov 2023 00:41:02 +0100 Subject: [PATCH] fix: takahe media --- .../kid/docker-compose.d/custom/nginx/conf.d/takahe.conf | 9 +++++++++ servers/kid/docker-compose.d/docker-compose.takahe.yml | 2 +- servers/kid/docker-compose.d/docker-compose.yml | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/servers/kid/docker-compose.d/custom/nginx/conf.d/takahe.conf b/servers/kid/docker-compose.d/custom/nginx/conf.d/takahe.conf index 71d1f14..495ac78 100644 --- a/servers/kid/docker-compose.d/custom/nginx/conf.d/takahe.conf +++ b/servers/kid/docker-compose.d/custom/nginx/conf.d/takahe.conf @@ -10,4 +10,13 @@ server { proxy_pass http://takahe:8000; } +} + +server { + listen 80; + server_name takahemedia.ixvd.net; + + location / { + root /usr/share/takahe; + } } \ No newline at end of file diff --git a/servers/kid/docker-compose.d/docker-compose.takahe.yml b/servers/kid/docker-compose.d/docker-compose.takahe.yml index 6068164..0117514 100644 --- a/servers/kid/docker-compose.d/docker-compose.takahe.yml +++ b/servers/kid/docker-compose.d/docker-compose.takahe.yml @@ -7,7 +7,7 @@ x-takahe-common: &takahe-common TAKAHE_DATABASE_SERVER: "postgres://takahe:takahe@takahe-db/takahe" TAKAHE_MEDIA_BACKEND: "local://" TAKAHE_MEDIA_ROOT: "/media" - TAKAHE_MEDIA_URL: "/media/" + TAKAHE_MEDIA_URL: "https://takahemedia.ixvd.net/" TAKAHE_MAIN_DOMAIN: "takahe.ixvd.net" env_file: - /etc/ixvd/secrets/env/takahe.env diff --git a/servers/kid/docker-compose.d/docker-compose.yml b/servers/kid/docker-compose.d/docker-compose.yml index 563e8e9..4a8598f 100644 --- a/servers/kid/docker-compose.d/docker-compose.yml +++ b/servers/kid/docker-compose.d/docker-compose.yml @@ -7,10 +7,11 @@ services: build: custom/nginx environment: CERTBOT_EMAIL: "webmaster@ixvd.net" - CERTBOT_DOMAINS: "kid.ixvd.net,fedi.ixvd.net,matrix.ixvd.net,matrix.neo.ixvd.net,cinny.ixvd.net,search.ixvd.net,pad.ixvd.net,sandbox.pad.ixvd.net,bin.ixvd.net,takahe.ixvd.net" + CERTBOT_DOMAINS: "kid.ixvd.net,fedi.ixvd.net,matrix.ixvd.net,matrix.neo.ixvd.net,cinny.ixvd.net,search.ixvd.net,pad.ixvd.net,sandbox.pad.ixvd.net,bin.ixvd.net,takahe.ixvd.net,takahemedia.ixvd.net" volumes: - /srv/certbot/data:/etc/letsencrypt - /srv/certbot/other/www:/var/www/certbot + - /srv/takahe/data:/usr/share/takahe ports: - 80:80 - 443:443