From 00cfb9a1c1a442fb445ae475ee8464468b178acd Mon Sep 17 00:00:00 2001
From: Paul-Henri Froidmont <git.contact-57n2p@froidmont.org>
Date: Wed, 24 Mar 2021 03:26:53 +0100
Subject: [PATCH] Update and fix Invidious

---
 roles/invidious-docker/files/config.yml       | 17 ---------
 .../invidious-docker/files/docker-compose.yml | 35 ++++++++++++++++---
 roles/invidious-docker/tasks/main.yml         |  5 ---
 3 files changed, 31 insertions(+), 26 deletions(-)
 delete mode 100644 roles/invidious-docker/files/config.yml

diff --git a/roles/invidious-docker/files/config.yml b/roles/invidious-docker/files/config.yml
deleted file mode 100644
index b639993..0000000
--- a/roles/invidious-docker/files/config.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-crawl_threads: 1
-channel_threads: 1
-feed_threads: 1
-video_threads: 1
-db:
-  user: kemal
-  password: kemal
-  host: postgres
-  port: 5432
-  dbname: invidious
-full_refresh: false
-https_only: true
-geo_bypass: true
-top_enabled: false
-force_resolve: ipv4
-admins:
-  - paultrial
diff --git a/roles/invidious-docker/files/docker-compose.yml b/roles/invidious-docker/files/docker-compose.yml
index 6dc3798..0c38614 100644
--- a/roles/invidious-docker/files/docker-compose.yml
+++ b/roles/invidious-docker/files/docker-compose.yml
@@ -7,14 +7,19 @@ networks:
 
 services:
   postgres:
-    build:
-      context: repo
-      dockerfile: docker/Dockerfile.postgres
+    image: postgres:10
     restart: unless-stopped
     volumes:
       - /var/lib/postgresql/invidious:/var/lib/postgresql/data
       - /backups/invidious:/backups
-      - /etc/localtime:/etc/localtime:ro
+      - ./repo/config/sql:/config/sql
+      - ./repo/docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
+    environment:
+      POSTGRES_DB: invidious
+      POSTGRES_PASSWORD: kemal
+      POSTGRES_USER: kemal
+    healthcheck:
+      test: [ "CMD", "pg_isready", "-U", "postgres" ]
   invidious:
     build:
       context: repo
@@ -24,6 +29,28 @@ services:
       - ./config.yml:/invidious/config/config.yml
     expose:
       - 3000
+    environment:
+      # Adapted from ./config/config.yml
+      INVIDIOUS_CONFIG: |
+        crawl_threads: 1
+        channel_threads: 1
+        check_tables: true
+        feed_threads: 1
+        video_threads: 1
+        db:
+          user: kemal
+          password: kemal
+          host: postgres
+          port: 5432
+          dbname: invidious
+        full_refresh: false
+        https_only: true
+        geo_bypass: true
+        top_enabled: false
+        force_resolve: ipv4
+        admins:
+          - paultrial
+        domain: yt.banditlair.com
     labels:
       - "traefik.backend=invidious"
       - "traefik.docker.network=web"
diff --git a/roles/invidious-docker/tasks/main.yml b/roles/invidious-docker/tasks/main.yml
index 00a8800..55d6b2d 100644
--- a/roles/invidious-docker/tasks/main.yml
+++ b/roles/invidious-docker/tasks/main.yml
@@ -4,11 +4,6 @@
     src: docker-compose.yml
     dest: "{{docker_compose_files_folder}}/invidious/"
 
-- name: Copy config
-  copy:
-    src: config.yml
-    dest: "{{docker_compose_files_folder}}/invidious/"
-
 - name: Checkout git repo
   git:
     repo: https://github.com/omarroth/invidious.git