From 2b9fc04bd8956d6b376a6146af5960915883eabe Mon Sep 17 00:00:00 2001 From: geezo Date: Thu, 6 Mar 2025 03:52:15 +0000 Subject: [PATCH] shit ton of changes --- .../hastebin}/docker-compose.yml | 0 caddy/docker-compose.yml | 33 +++++++++---------- glance/docker-compose.yml | 5 --- navidrome/docker-compose.yml | 2 +- newt/docker-compose.yml | 9 +++++ nextcloud/docker-compose.yml | 3 -- tubearchivist/docker-compose.yml | 21 ++++++++---- yams/.env | 2 +- yams/docker-compose.yml | 2 +- 9 files changed, 41 insertions(+), 36 deletions(-) rename {hastebin => _archive/hastebin}/docker-compose.yml (100%) diff --git a/hastebin/docker-compose.yml b/_archive/hastebin/docker-compose.yml similarity index 100% rename from hastebin/docker-compose.yml rename to _archive/hastebin/docker-compose.yml diff --git a/caddy/docker-compose.yml b/caddy/docker-compose.yml index cfa920a..b42c62d 100644 --- a/caddy/docker-compose.yml +++ b/caddy/docker-compose.yml @@ -21,12 +21,11 @@ services: - gitea_gitea - hoarder_default - immich_default - - n8n_default - - navidrome_default - - olivetin_default - - paperless-ai_default - - paperless-ngx_default - - vaultwarden_default + # - n8n_default + # - olivetin_default + # - paperless-ai_default + # - paperless-ngx_default + # - vaultwarden_default - yams_default - beszel_default - dozzle_default @@ -48,18 +47,16 @@ networks: external: true immich_default: external: true - n8n_default: - external: true - navidrome_default: - external: true - olivetin_default: - external: true - paperless-ai_default: - external: true - paperless-ngx_default: - external: true - vaultwarden_default: - external: true + # n8n_default: + # external: true + # olivetin_default: + # external: true + # paperless-ai_default: + # external: true + # paperless-ngx_default: + # external: true + # vaultwarden_default: + # external: true yams_default: external: true beszel_default: diff --git a/glance/docker-compose.yml b/glance/docker-compose.yml index acc9a38..09466cf 100644 --- a/glance/docker-compose.yml +++ b/glance/docker-compose.yml @@ -11,12 +11,7 @@ services: - 1005:8080 restart: unless-stopped networks: - - tunnel - default - - networks: - tunnel: - external: true default: diff --git a/navidrome/docker-compose.yml b/navidrome/docker-compose.yml index 761226c..bc13869 100644 --- a/navidrome/docker-compose.yml +++ b/navidrome/docker-compose.yml @@ -15,7 +15,7 @@ services: ND_SCANNER_GROUPALBUMRELEASES: true volumes: - "./data:/data" - - "./:/music:ro" + - "/home/geezo/nfs_shares/media/music:/music:ro" networks: - tunnel - default diff --git a/newt/docker-compose.yml b/newt/docker-compose.yml index df4d2cb..cf78c3f 100644 --- a/newt/docker-compose.yml +++ b/newt/docker-compose.yml @@ -10,6 +10,9 @@ services: networks: - beaverhabits_default - authentik_default + - glance_default + - hoarder_default + - nextcloud_default extra_hosts: - "pangolin.geezo.site:44.210.184.15" @@ -18,4 +21,10 @@ networks: beaverhabits_default: external: true authentik_default: + external: true + glance_default: + external: true + hoarder_default: + external: true + nextcloud_default: external: true \ No newline at end of file diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml index 04d5d0e..66338dd 100644 --- a/nextcloud/docker-compose.yml +++ b/nextcloud/docker-compose.yml @@ -33,7 +33,6 @@ services: - MYSQL_USER=nextcloud - MYSQL_HOST=db networks: - - tunnel - default labels: glance.name: NextCloud @@ -43,6 +42,4 @@ services: glance.hide: false networks: - tunnel: - external: true default: \ No newline at end of file diff --git a/tubearchivist/docker-compose.yml b/tubearchivist/docker-compose.yml index 79415de..e89a8fc 100644 --- a/tubearchivist/docker-compose.yml +++ b/tubearchivist/docker-compose.yml @@ -1,21 +1,19 @@ -version: '3.5' - services: tubearchivist: container_name: tubearchivist restart: unless-stopped image: bbilly1/tubearchivist - # ports: - # - 1011:9000 ### through gluetun + ports: + - 1021:9000 volumes: - - /home/geezo/media/youtube:/youtube + - /home/geezo/nfs_shares/media/youtube:/youtube - cache:/cache environment: - ES_URL=http://archivist-es:9200 # needs protocol e.g. http and port - REDIS_HOST=archivist-redis # don't add protocol - HOST_UID=1000 - HOST_GID=1000 - - TA_HOST=http://theocorp:1011 # set your host name + - TA_HOST=http://theocorp:1021 # set your host name - TA_USERNAME=geezo # your initial TA credentials - TA_PASSWORD=verysecret # your initial TA credentials - ELASTIC_PASSWORD=verysecret # set password for Elasticsearch @@ -30,7 +28,10 @@ services: depends_on: - archivist-es - archivist-redis - network_mode: "container:gluetun" + networks: + - yams_default + - default + archivist-redis: image: redis/redis-stack-server container_name: archivist-redis @@ -64,3 +65,9 @@ volumes: cache: redis: es: + +networks: + yams_default: + external: true + default: + diff --git a/yams/.env b/yams/.env index 6d4f805..10c96eb 100644 --- a/yams/.env +++ b/yams/.env @@ -1,7 +1,7 @@ # Base configuration PUID=1000 PGID=1000 -MEDIA_DIRECTORY=/home/geezo/media +MEDIA_DIRECTORY=/home/geezo/nfs_shares/media/ INSTALL_DIRECTORY=/home/geezo/docker_containers/yams MEDIA_SERVICE=jellyfin diff --git a/yams/docker-compose.yml b/yams/docker-compose.yml index a1c2938..b27a50b 100644 --- a/yams/docker-compose.yml +++ b/yams/docker-compose.yml @@ -179,7 +179,7 @@ services: # Watchtower is going to keep our instances updated watchtower: image: containrrr/watchtower - container_name: watchtower + container_name: watchtower-yams environment: - WATCHTOWER_CLEANUP=true volumes: