Update invidious configurations

invidious/inv_sig_helper_cluster/docker-compose.yml

@@ -1,43 +0,0 @@
-services:
-  inv_sig_helper_cluster:
-    image: git.nadeko.net/fijxu/inv_sig_helper:latest
-    restart: unless-stopped
-    mem_limit: "512m"
-    cpus: 0.2
-    init: true
-    command: ["--tcp", "0.0.0.0:12999"]
-    stop_grace_period: 5s
-    logging:
-      driver: none
-    environment:
-      - RUST_LOG=warn
-    deploy:
-      replicas: 6
-    networks:
-      - invidious
-      # - gluetun_network
-      # - gluetun_network_2
-      # - invidious-external
-
-  sig-haproxy:
-    image: haproxy:lts-alpine
-    restart: always
-    ports:
-      - "127.0.0.1:10095:8405"
-    volumes:
-      - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
-    networks:
-      - invidious
-      - gluetun_network
-      - gluetun_network_2
-      - invidious-external
-
-networks:
-  invidious:
-    external: true
-  gluetun_network:
-    external: true
-  gluetun_network_2:
-    external: true
-  invidious-external:
-    external: true

invidious/inv_sig_helper_cluster/haproxy.cfg

@@ -1,38 +0,0 @@
-global
-    # This because haproxy is dumb and likes to use the maxconnection from the kernel and that is super mega huge making haproxy oom
-    maxconn 128
-
-resolvers docker
-    # To be able to use multiple replicas of invidious
-    # using domains
-    nameserver dns1 127.0.0.11:53
-
-defaults
-    # Without timeouts to prevent haproxy kill the connection
-    # when there is no packets being sent between the sig helper and
-    # invidious
-
-    #timeout client 60s
-    #timeout connect 1s
-    #timeout server 60s
-
-# Prometheus for graphs
-frontend prometheus
-    bind *:8405
-    mode http
-    http-request use-service prometheus-exporter if { path /metrics }
-    no log
-
-frontend sighelper
-    mode tcp
-    bind *:13000
-    default_backend sighelper
-
-backend sighelper
-   mode tcp
-   balance leastconn
-   option tcp-check
-   tcp-check send-binary 0512345678
-   tcp-check expect rbinary 12345678*
-   option redispatch
-   server-template inv_sig_helper 16 inv_sig_helper_cluster:12999 resolvers docker check inter 500ms

invidious/invidious-2/docker-compose-novpn.yml

@@ -1,5 +1,8 @@
 # Docker compose file for Backend 2 of inv.nadeko.net
 
+x-labels: &labels
+  labels: [ "com.centurylinklabs.watchtower.scope=invidious" ]
+
 services:
   # INVIDIOUS CLEARNET
   invidious:
@@ -23,6 +26,7 @@ services:
       INVIDIOUS_REDIS_URL: "tcp://valkey:6379"
     depends_on:
       - haproxy
+    <<: *labels
 
   # Without depends because haproxy is smart
   haproxy:
@@ -36,15 +40,6 @@ services:
     volumes:
       - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
 
-  # ptgen:
-  #   image: git.nadeko.net/fijxu/youtube-po-token-generator:latest
-  #   cpus: 0.1
-  #   restart: unless-stopped
-  #   environment:
-  #     - PORT=7070
-  #   depends_on:
-  #     - haproxy
-
 networks:
   default:
     name: invidious-2

invidious/invidious-3/docker-compose-novpn.yml

@@ -1,4 +1,7 @@
-# Docker compose file for Backend 2 of inv.nadeko.net
+# Docker compose file for Backend 3 of inv.nadeko.net
+
+x-labels: &labels
+  labels: [ "com.centurylinklabs.watchtower.scope=invidious" ]
 
 services:
   # INVIDIOUS CLEARNET
@@ -23,6 +26,7 @@ services:
       INVIDIOUS_REDIS_URL: "tcp://valkey:6379"
     depends_on:
       - haproxy
+    <<: *labels
 
   # Without depends because haproxy is smart
   haproxy:
@@ -36,15 +40,6 @@ services:
     volumes:
       - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
 
-  # ptgen:
-  #   image: git.nadeko.net/fijxu/youtube-po-token-generator:latest
-  #   cpus: 0.1
-  #   restart: unless-stopped
-  #   environment:
-  #     - PORT=7070
-  #   depends_on:
-  #     - haproxy
-
 networks:
   default:
     name: invidious-3

invidious/invidious-4/docker-compose.yml

@@ -1,5 +1,8 @@
 # Docker compose file for Backend 4 of inv.nadeko.net
 
+x-labels: &labels
+  labels: [ "com.centurylinklabs.watchtower.scope=invidious" ]
+
 services:
   # INVIDIOUS CLEARNET
   invidious:
@@ -23,6 +26,7 @@ services:
       INVIDIOUS_REDIS_URL: "tcp://valkey:6379"
     depends_on:
       - haproxy
+    <<: *labels
 
   # Without depends because haproxy is smart
   haproxy:
@@ -36,15 +40,6 @@ services:
     volumes:
       - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg
 
-  # ptgen:
-  #   image: git.nadeko.net/fijxu/youtube-po-token-generator:latest
-  #   cpus: 0.1
-  #   restart: unless-stopped
-  #   environment:
-  #     - PORT=7070
-  #   depends_on:
-  #     - haproxy
-
 networks:
   default:
     name: invidious-4

invidious/invidious-feed-receiver/docker-compose.yml

@@ -1,5 +1,8 @@
 # Docker compose file for the feed reciever of inv.nadeko.net
 
+x-labels: &labels
+  labels: [ "com.centurylinklabs.watchtower.scope=invidious" ]
+
 services:
   # INVIDIOUS CLEARNET
   invidious-feed-reciever:
@@ -12,6 +15,7 @@ services:
       - ./config.yml:/etc/invidious/config.yml:ro
     environment:
       INVIDIOUS_CONFIG_FILE: "/etc/invidious/config.yml"
+    <<: *labels
 
   valkey:
     image: valkey/valkey:7.2-alpine
@@ -19,11 +23,3 @@ services:
     volumes:
       - ./valkey.conf:/usr/local/etc/valkey/valkey.conf
     command: "valkey-server /usr/local/etc/valkey/valkey.conf"
-
-  # ptgen:
-  #   image: git.nadeko.net/fijxu/youtube-po-token-generator:latest
-  #   cpus: 0.1
-  #   restart: unless-stopped
-  #   environment:
-  #     - PORT=7070
-  #

invidious/invidious/docker-compose.yml

@@ -1,5 +1,8 @@
 # Docker compose file for Backend 1 of inv.nadeko.net
 
+x-labels: &labels
+  labels: [ "com.centurylinklabs.watchtower.scope=invidious" ]
+
 services:
   # INVIDIOUS CLEARNET
   invidious:
@@ -23,6 +26,7 @@ services:
       INVIDIOUS_REDIS_URL: "tcp://valkey:6379"
     depends_on:
       - haproxy
+    <<: *labels
 
   # Without depends because haproxy is smart
   haproxy:

invidious/materialious/docker-compose.yml

@@ -1,26 +0,0 @@
-services:
-  # MATERIALIOUS
-  materialious:
-    image: wardpearce/materialious:latest
-    container_name: materialious
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:10013:80"
-    environment:
-      VITE_DEFAULT_DEARROW_THUMBNAIL_INSTANCE: "https://dearrow-thumb.ajay.app"
-      #VITE_DEFAULT_SYNCIOUS_INSTANCE: "https://syncious.nadeko.net"
-      VITE_DEFAULT_RETURNYTDISLIKES_INSTANCE: "https://returnyoutubedislikeapi.com"
-      VITE_DEFAULT_PEERJS_PATH: "/"
-      VITE_DEFAULT_PEERJS_HOST: "peerjs.nadeko.net"
-      VITE_DEFAULT_SPONSERBLOCK_INSTANCE: "https://sponsor.ajay.app"
-      VITE_DEFAULT_DEARROW_INSTANCE: "https://sponsor.ajay.app"
-      VITE_DEFAULT_INVIDIOUS_INSTANCE: "https://inv.nadeko.net"
-      VITE_DEFAULT_PEERJS_PORT: 443
-      VITE_DEFAULT_SETTINGS: '{"darkMode": true, "themeColor": "#FFB3FD", "autoPlay": true, "alwaysLoop": false, "proxyVideos": false, "listenByDefault": false, "savePlaybackPosition": true, "dashEnabled": true, "theatreModeByDefault": false, "autoplayNextByDefault": true, "returnYtDislikes": true, "searchSuggestions": true, "previewVideoOnHover": true, "sponsorBlock": true, "sponsorBlockCategories": "sponsor,interaction,selfpromo", "deArrowEnabled": false, "playerMiniPlayer": true, "syncious": false}'
-
-  peerjs:
-    image: peerjs/peerjs-server:latest
-    container_name: invidious-peerjs
-    restart: unless-stopped
-    ports:
-      - 127.0.0.1:10015:9000

invidious/restart-fucking-everything.sh

@@ -2,6 +2,6 @@
 
 docker compose --file /home/services/invidious/invidious-feed-receiver/docker-compose.yml up -d --force-recreate --remove-orphans
 docker compose --file /home/services/invidious/invidious/docker-compose.yml up -d --force-recreate --remove-orphans
-docker compose --file /home/services/invidious/invidious-vpn/docker-compose.yml up -d --force-recreate --remove-orphans
+docker compose --file /home/services/invidious/invidious-2/docker-compose-novpn.yml up -d --force-recreate --remove-orphans
-docker compose --file /home/services/invidious/invidious-vpn-2/docker-compose.yml up -d --force-recreate --remove-orphans
+docker compose --file /home/services/invidious/invidious-3/docker-compose-novpn.yml up -d --force-recreate --remove-orphans
-docker compose --file /home/services/invidious/invidious-external/docker-compose.yml up -d --force-recreate --remove-orphans
+docker compose --file /home/services/invidious/invidious-4/docker-compose.yml up -d --force-recreate --remove-orphans