From 2ffe950f2d41c11bf53a350c204166d9bb21da86 Mon Sep 17 00:00:00 2001
From: tiyn <tiyn@mail-mk.eu>
Date: Wed, 7 Sep 2022 17:30:16 +0200
Subject: [PATCH] invidious: updated docker-compose and added sponsorblock

---
 wiki/docker-images/iv-org_-_invidious.md | 57 ++++++++++++++----------
 wiki/firefox.md                          |  3 ++
 wiki/invidious.md                        |  9 +++-
 3 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/wiki/docker-images/iv-org_-_invidious.md b/wiki/docker-images/iv-org_-_invidious.md
index d178487..1a732eb 100755
--- a/wiki/docker-images/iv-org_-_invidious.md
+++ b/wiki/docker-images/iv-org_-_invidious.md
@@ -56,19 +56,7 @@ cd ..
 ```yml
 version: "3"
 services:
-  postgres:
-    image: postgres:10
-    restart: unless-stopped
-    volumes:
-      - postgresdata:/var/lib/postgresql/data
-      - ./config/sql:/config/sql
-      - ./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: .
@@ -77,24 +65,47 @@ services:
     ports:
       - "3000:3000"
     environment:
-      # Adapted from ./config/config.yml
+      # Please read the following file for a comprehensive list of all available
+      # configuration options and their associated syntax:
+      # https://github.com/iv-org/invidious/blob/master/config/config.example.yml
       INVIDIOUS_CONFIG: |
-        channel_threads: 1
-        check_tables: true
-        feed_threads: 1
         db:
+          dbname: invidious
           user: kemal
           password: kemal
-          host: postgres
+          host: invidious-db
           port: 5432
-          dbname: invidious
-        full_refresh: false
+        check_tables: true
+        # external_port:
+        domain: yt.home.server
         https_only: false
-        registration_enabled: false
         popular_enabled: false
-        domain: yt.home.server
+        registration_enabled: false
+        # statistics_enabled: false
+        default_user_preferences:
+            dark_mode: true
+            default_home: "Subscriptions"
+    healthcheck:
+      test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/comments/jNQXAC9IVRw || exit 1
+      interval: 30s
+      timeout: 5s
+      retries: 2
     depends_on:
-      - postgres
+      - invidious-db
+
+  invidious-db:
+    image: docker.io/library/postgres:13
+    restart: unless-stopped
+    volumes:
+      - postgresdata:/var/lib/postgresql/data
+      - ./config/sql:/config/sql
+      - ./docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
+    environment:
+      POSTGRES_DB: invidious
+      POSTGRES_USER: kemal
+      POSTGRES_PASSWORD: kemal
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
 
 volumes:
   postgresdata:
diff --git a/wiki/firefox.md b/wiki/firefox.md
index 51a86e7..504945b 100644
--- a/wiki/firefox.md
+++ b/wiki/firefox.md
@@ -60,6 +60,9 @@ They can be removed and configured under `about:config`.
 - [Privacy Redirect](https://addons.mozilla.org/en-US/Firefox/addon/privacy-redirect/)
   redirects youtube, instagram, twitter, etc to free alternatives or alternative
   frontends.
+- [SponsorBlock](https://addons.mozilla.org/en-US/firefox/addon/sponsorblock/)
+  skips YouTube video sponsors automatically, works with
+  [invidious](./invidious.md) too.
 - [Temporary Containers](https://addons.mozilla.org/en-GB/Firefox/addon/temporary-containers)
   opens tabs and websites, that are not already managed by
   `Firefox Multi-Account Containers` in a new container.
diff --git a/wiki/invidious.md b/wiki/invidious.md
index a23c0bb..c0afe81 100644
--- a/wiki/invidious.md
+++ b/wiki/invidious.md
@@ -6,7 +6,7 @@ It includes locally stored subscription management.
 
 ## Server
 
-A server can be setup via docker with the [linuxserver image](./docker-images/linuxserver_-_jellyfin.md).
+A server can be setup via docker with the [iv-org image](./docker-images/iv-org_-_invidious.md).
 
 ## Automatic redirect from YouTube
 
@@ -17,3 +17,10 @@ For Firefox for example there is
 or [privacy redirect](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/).
 For Android there is
 [the UntrackMe app](https://framagit.org/tom79/nitterizeme) (available at [f-droid](./android/f-droid.md)).
+
+## Skip sponsorships in videos
+
+When using [Firefox](./firefox.md) SponsorBlock can be installed.
+This will skip YouTube video sponsors in YouTube and in Invidious.
+Further informations and links can be found in the
+[Firefox entry of this wiki](./firefox.md#list-of-useful-firefox-addons).