update invidious
This commit is contained in:
parent
09f2347f82
commit
28fca62c99
4 changed files with 29 additions and 157 deletions
|
|
@ -27,7 +27,7 @@ x-common: &common-invidious
|
|||
mem_limit: 780MB
|
||||
cpus: 0.50
|
||||
deploy:
|
||||
replicas: 1
|
||||
replicas: 4
|
||||
volumes:
|
||||
# Volume is not needed anymore since I use pgbouncer now
|
||||
# - /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432:rw
|
||||
|
|
@ -49,6 +49,7 @@ x-common-anubis-env: &common-anubis-env
|
|||
SERVE_ROBOTS_TXT: "true"
|
||||
BIND: "0.0.0.0:4000"
|
||||
METRICS_BIND: "0.0.0.0:9090"
|
||||
ED25519_PRIVATE_KEY_HEX: "968d74c86d663b499bdfcfd843c6a3489ed94b66005c5c3fdb42a455f596908b"
|
||||
POLICY_FNAME: "/data/cfg/botPolicy.json"
|
||||
|
||||
x-common-anubis: &common-anubis
|
||||
|
|
@ -66,42 +67,9 @@ services:
|
|||
<<: *common-invidious
|
||||
environment:
|
||||
<<: *common-invidious-env
|
||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-cl2-c.nadeko.net:8443", "public_url": "https://inv-cl2-c.nadeko.net:8443"}]'
|
||||
networks: ["invidious"]
|
||||
depends_on: ["valkey"]
|
||||
|
||||
invidious2:
|
||||
<<: *common-invidious
|
||||
environment:
|
||||
<<: *common-invidious-env
|
||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-ca1-c.nadeko.net", "public_url": "https://inv-ca1-c.nadeko.net"}]'
|
||||
networks: ["invidious2"]
|
||||
depends_on: ["valkey2"]
|
||||
|
||||
invidious3:
|
||||
<<: *common-invidious
|
||||
environment:
|
||||
<<: *common-invidious-env
|
||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-us2-c.nadeko.net", "public_url": "https://inv-us2-c.nadeko.net"}]'
|
||||
networks: ["invidious3"]
|
||||
depends_on: ["valkey3"]
|
||||
|
||||
invidious4:
|
||||
<<: *common-invidious
|
||||
environment:
|
||||
<<: *common-invidious-env
|
||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-eu3-c.nadeko.net", "public_url": "https://inv-eu3-c.nadeko.net"}]'
|
||||
networks: ["invidious4"]
|
||||
depends_on: ["valkey4"]
|
||||
|
||||
invidious5:
|
||||
<<: *common-invidious
|
||||
environment:
|
||||
<<: *common-invidious-env
|
||||
INVIDIOUS_INVIDIOUS_COMPANION: '[{"private_url": "https://inv-eu2-c.nadeko.net", "public_url": "https://inv-eu2-c.nadeko.net"}]'
|
||||
networks: ["invidious5"]
|
||||
depends_on: ["valkey5"]
|
||||
|
||||
# ANUBIS SECTION #
|
||||
|
||||
anubis-inv:
|
||||
|
|
@ -114,57 +82,13 @@ services:
|
|||
ports:
|
||||
- 127.0.0.1:9051:9090
|
||||
|
||||
anubis-inv2:
|
||||
<<: *common-anubis
|
||||
environment:
|
||||
<<: *common-anubis-env
|
||||
TARGET: "http://invidious2:3000"
|
||||
COOKIE: "anubis.inv2"
|
||||
networks: ["invidious2"]
|
||||
ports:
|
||||
- 127.0.0.1:9052:9090
|
||||
|
||||
anubis-inv3:
|
||||
<<: *common-anubis
|
||||
environment:
|
||||
<<: *common-anubis-env
|
||||
TARGET: "http://invidious3:3000"
|
||||
COOKIE: "anubis.inv3"
|
||||
networks: ["invidious3"]
|
||||
ports:
|
||||
- 127.0.0.1:9053:9090
|
||||
|
||||
anubis-inv4:
|
||||
<<: *common-anubis
|
||||
environment:
|
||||
<<: *common-anubis-env
|
||||
TARGET: "http://invidious4:3000"
|
||||
COOKIE: "anubis.inv4"
|
||||
networks: ["invidious4"]
|
||||
ports:
|
||||
- 127.0.0.1:9054:9090
|
||||
|
||||
anubis-inv5:
|
||||
<<: *common-anubis
|
||||
environment:
|
||||
<<: *common-anubis-env
|
||||
TARGET: "http://invidious5:3000"
|
||||
COOKIE: "anubis.inv5"
|
||||
networks: ["invidious5"]
|
||||
ports:
|
||||
- 127.0.0.1:9055:9090
|
||||
|
||||
# HAPROXY SECTION #
|
||||
haproxy:
|
||||
<<: *common-haproxy
|
||||
ports:
|
||||
- "127.0.0.1:11101:8001"
|
||||
- "127.0.0.1:11102:8002"
|
||||
- "127.0.0.1:11103:8003"
|
||||
- "127.0.0.1:11104:8004"
|
||||
- "127.0.0.1:11105:8005"
|
||||
- "127.0.0.1:11111:8404"
|
||||
networks: ["invidious", "invidious2", "invidious3", "invidious4", "invidious5"]
|
||||
networks: ["invidious"]
|
||||
|
||||
# Pgbouncer to keep connections to the database open
|
||||
pgbouncer:
|
||||
|
|
@ -180,16 +104,8 @@ services:
|
|||
mem_limit: "128m"
|
||||
volumes:
|
||||
- /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432:rw
|
||||
networks: ["invidious", "invidious2", "invidious3", "invidious4", "invidious5"]
|
||||
networks: ["invidious"]
|
||||
|
||||
networks:
|
||||
invidious:
|
||||
name: invidious
|
||||
invidious2:
|
||||
name: invidious2
|
||||
invidious3:
|
||||
name: invidious3
|
||||
invidious4:
|
||||
name: invidious4
|
||||
invidious5:
|
||||
name: invidious5
|
||||
|
|
|
|||
|
|
@ -47,57 +47,13 @@ frontend invidious
|
|||
use_backend anubis-inv if { path /watch } || { path_beg /.within.website }
|
||||
default_backend invidious
|
||||
|
||||
frontend invidious2
|
||||
bind *:8002
|
||||
use_backend anubis-inv2 if { path /watch } || { path_beg /.within.website }
|
||||
default_backend invidious2
|
||||
|
||||
frontend invidious3
|
||||
bind *:8003
|
||||
use_backend anubis-inv3 if { path /watch } || { path_beg /.within.website }
|
||||
default_backend invidious3
|
||||
|
||||
frontend invidious4
|
||||
bind *:8004
|
||||
use_backend anubis-inv4 if { path /watch } || { path_beg /.within.website }
|
||||
default_backend invidious4
|
||||
|
||||
frontend invidious5
|
||||
bind *:8005
|
||||
use_backend anubis-inv5 if { path /watch } || { path_beg /.within.website }
|
||||
default_backend invidious5
|
||||
|
||||
backend anubis-inv
|
||||
server srv1 anubis-inv:4000 check resolvers docker init-addr libc,none
|
||||
server srv2 invidious:3000 check backup resolvers docker init-addr libc,none
|
||||
|
||||
backend anubis-inv2
|
||||
server srv1 anubis-inv2:4000 check resolvers docker init-addr libc,none
|
||||
server srv2 invidious2:3000 check backup resolvers docker init-addr libc,none
|
||||
|
||||
backend anubis-inv3
|
||||
server srv1 anubis-inv3:4000 check resolvers docker init-addr libc,none
|
||||
server srv2 invidious3:3000 check backup resolvers docker init-addr libc,none
|
||||
|
||||
backend anubis-inv4
|
||||
server srv1 anubis-inv4:4000 check resolvers docker init-addr libc,none
|
||||
server srv2 invidious4:3000 check backup resolvers docker init-addr libc,none
|
||||
|
||||
backend anubis-inv5
|
||||
server srv1 anubis-inv5:4000 check resolvers docker init-addr libc,none
|
||||
server srv2 invidious5:3000 check backup resolvers docker init-addr libc,none
|
||||
# server srv2 invidious:3000 check backup resolvers docker init-addr libc,none
|
||||
# server srv2 invidious:3000 check backup resolvers docker init-addr libc,none
|
||||
# server srv2 invidious:3000 check backup resolvers docker init-addr libc,none
|
||||
# server srv2 invidious:3000 check backup resolvers docker init-addr libc,none
|
||||
|
||||
backend invidious
|
||||
server-template srv 2 invidious:3000 check resolvers docker init-addr libc,none
|
||||
server-template srv 4 invidious:3000 check resolvers docker init-addr libc,none
|
||||
|
||||
backend invidious2
|
||||
server-template srv 2 invidious2:3000 check resolvers docker init-addr libc,none
|
||||
|
||||
backend invidious3
|
||||
server-template srv 2 invidious3:3000 check resolvers docker init-addr libc,none
|
||||
|
||||
backend invidious4
|
||||
server-template srv 2 invidious4:3000 check resolvers docker init-addr libc,none
|
||||
|
||||
backend invidious5
|
||||
server-template srv 2 invidious5:3000 check resolvers docker init-addr libc,none
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@ services:
|
|||
networks:
|
||||
- invidious
|
||||
|
||||
valkey2:
|
||||
<<: *common
|
||||
networks:
|
||||
- invidious2
|
||||
|
||||
valkey3:
|
||||
<<: *common
|
||||
networks:
|
||||
- invidious3
|
||||
|
||||
valkey4:
|
||||
<<: *common
|
||||
networks:
|
||||
- invidious4
|
||||
|
||||
valkey5:
|
||||
<<: *common
|
||||
networks:
|
||||
- invidious5
|
||||
# valkey2:
|
||||
# <<: *common
|
||||
# networks:
|
||||
# - invidious2
|
||||
#
|
||||
# valkey3:
|
||||
# <<: *common
|
||||
# networks:
|
||||
# - invidious3
|
||||
#
|
||||
# valkey4:
|
||||
# <<: *common
|
||||
# networks:
|
||||
# - invidious4
|
||||
#
|
||||
# valkey5:
|
||||
# <<: *common
|
||||
# networks:
|
||||
# - invidious5
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
maxmemory 796mb
|
||||
maxmemory 2048mb
|
||||
maxmemory-policy volatile-lfu
|
||||
|
||||
# Disable AOF
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue