From 3f9803b22b3cf66070b7d67abfb0e262df0bfde5 Mon Sep 17 00:00:00 2001
From: root <root@nadeko.net>
Date: Mon, 20 Jan 2025 15:25:56 -0300
Subject: [PATCH] update invidious config, again

---
 invidious/invidious-all/docker-compose.yml    | 27 +++++++++++++------
 invidious/valkey-invidious/docker-compose.yml |  4 +++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/invidious/invidious-all/docker-compose.yml b/invidious/invidious-all/docker-compose.yml
index f2349cc..483caeb 100644
--- a/invidious/invidious-all/docker-compose.yml
+++ b/invidious/invidious-all/docker-compose.yml
@@ -3,6 +3,7 @@
 # https://docs.docker.com/compose/how-tos/multiple-compose-files/include/
 include:
   - ../valkey-invidious/docker-compose.yml
+  - ../invidious-companion/docker-compose.yml
 
 # https://docs.docker.com/reference/compose-file/extension/
 x-common-env: &common-env
@@ -12,12 +13,16 @@ x-common-env: &common-env
     INVIDIOUS_ALTERNATIVE_DOMAINS: '["inv.nadeko.net", "inv.nadekonw7plitnjuawu6ytjsl7jlglk2t6pyq6eftptmiv3dvqndwvyd.onion"]'
     INVIDIOUS_BACKEND_DOMAINS: '["inv1.nadeko.net", "inv2.nadeko.net", "inv3.nadeko.net", "inv4.nadeko.net", "inv5.nadeko.net"]'
 
+# https://docs.docker.com/reference/compose-file/extension/
+x-common-dep: &common-dep
+    depends_on: ["pgbouncer"]
+
 x-common: &common
   hostname: invidious
   env_file:
     # Env file containing INVIDIOUS_* variables
     - .env
-  image: "git.nadeko.net/fijxu/invidious-with-companion:latest"
+  image: "git.nadeko.net/fijxu/invidious:latest"
   restart: unless-stopped
   mem_limit: 512MB
   cpus: 0.25
@@ -27,8 +32,8 @@ x-common: &common
     # Volume is not needed anymore since I use pgbouncer now
     # - /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432:rw
     - ./config.yml:/etc/invidious/config.yml:ro
-  logging:
-    driver: none
+  # logging:
+  #   driver: none
   # Watchtower checks in intervals of 60 seconds for fast container updates. 
   # It needs to have a scope or Watchtower will spam docker servers asking 
   # for a new image update therefore rate limiting me
@@ -48,15 +53,18 @@ services:
     <<: *common
     environment:
       <<: *common-env
-      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-cl2.nadeko.net:8448", "public_url": "https://inv-cl2.nadeko.net:8448"}]'
+      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-cl2-c.nadeko.net:8443", "public_url": "https://inv-cl2-c.nadeko.net:8443"}]'
+      INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-cl2.nadeko.net:8443"]'
     networks: ["invidious"]
+    #depends_on: ["valkey", "haproxy", "companion1"]
     depends_on: ["valkey", "haproxy"]
 
   invidious2:
     <<: *common
     environment:
       <<: *common-env
-      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-ca1.nadeko.net:8448", "public_url": "https://inv-ca1.nadeko.net:8448"}]'
+      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-ca1-c.nadeko.net", "public_url": "https://inv-ca1-c.nadeko.net"}]'
+      INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-ca1.nadeko.net"]'
     networks: ["invidious2"]
     depends_on: ["valkey2", "haproxy2"]
 
@@ -64,7 +72,8 @@ services:
     <<: *common
     environment:
       <<: *common-env
-      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-us2.nadeko.net:8448", "public_url": "https://inv-us2.nadeko.net:8448"}]'
+      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-us2-c.nadeko.net", "public_url": "https://inv-us2-c.nadeko.net"}]'
+      INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-us2.nadeko.net"]'
     networks: ["invidious3"]
     depends_on: ["valkey3", "haproxy3"]
 
@@ -72,7 +81,8 @@ services:
     <<: *common
     environment:
       <<: *common-env
-      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-eu1.nadeko.net:8448", "public_url": "https://inv-eu1.nadeko.net:8448"}]'
+      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-eu1-c.nadeko.net", "public_url": "https://inv-eu1-c.nadeko.net"}]'
+      INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-eu1.nadeko.net"]'
     networks: ["invidious4"]
     depends_on: ["valkey4", "haproxy4"]
 
@@ -80,7 +90,8 @@ services:
     <<: *common
     environment:
       <<: *common-env
-      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-us1.nadeko.net:8448", "public_url": "https://inv-us1.nadeko.net:8448"}]'
+      INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-eu2-c.nadeko.net", "public_url": "https://inv-eu2-c.nadeko.net"}]'
+      INVIDIOUS_EXTERNAL_VIDEOPLAYBACK_PROXY: '["https://inv-eu2.nadeko.net"]'
     networks: ["invidious5"]
     depends_on: ["valkey5", "haproxy5"]
 
diff --git a/invidious/valkey-invidious/docker-compose.yml b/invidious/valkey-invidious/docker-compose.yml
index 831523d..6e07a0c 100644
--- a/invidious/valkey-invidious/docker-compose.yml
+++ b/invidious/valkey-invidious/docker-compose.yml
@@ -32,3 +32,7 @@ services:
     networks:
       - invidious4
 
+  valkey5:
+    <<: *common
+    networks:
+      - invidious5