From d35e8d3bacc67f29d9d498bf965b577591abe9bf Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Sat, 29 Jul 2023 10:52:54 -0700
Subject: [PATCH] Cleanup, untested guess at how to handle the variables in the
 pipe section.

---
 Config/Invidious/docker-compose.yml.TBD | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/Config/Invidious/docker-compose.yml.TBD b/Config/Invidious/docker-compose.yml.TBD
index c83bc53..88e034e 100644
--- a/Config/Invidious/docker-compose.yml.TBD
+++ b/Config/Invidious/docker-compose.yml.TBD
@@ -1,13 +1,11 @@
+# 2023-07-25
 # Invidious configuration.
 # This is a revised version of the original work here:
 #   https://hub.docker.com/_/nextcloud
 
-# Changelog:
-# 2023-07-16 Change from mariadb:10.5 to 10.6.
-
 version: "3"
-services:
 
+services:
   invidious:
     image: quay.io/invidious/invidious:latest
     restart: always
@@ -22,8 +20,8 @@ services:
       INVIDIOUS_CONFIG: |
         db:
           dbname: invidious
-          user:
-          password:
+          user: ${INV_DB_USER}
+          password: ${INV_DB_PASS}
           host: invidious-db
           port: 5432
         check_tables: true
@@ -31,7 +29,7 @@ services:
         domain:
         # https_only: false
         # statistics_enabled: false
-        hmac_key:
+        hmac_key: "${INV_HMAC_KEY}"
     healthcheck:
       test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/comments/jNQXAC9IVRw || exit 1
       interval: 30s
@@ -52,10 +50,10 @@ services:
       - ../../Volumes/Invidious/postgres/config/sql:/config/sql
       - ../../Volumes/Invidious/postgres/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
     env_file:
-      - ./pg.env
+      - ./inv.env
     environment:
       POSTGRES_DB: invidious
-      POSTGRES_USER:
-      POSTGRES_PASSWORD:
+      POSTGRES_USER: "${INV_DB_USER}"
+      POSTGRES_PASSWORD: "${INV_DB_PASS}"
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]