Replaced Libreddit with Redlib

files/teddit/about.pug

@@ -11,7 +11,7 @@ html
     .container
       .content
         h1 About
-        p Teddit is a free and open source alternative Reddit front-end focused on privacy. Teddit doesn't require you to have JavaScript enabled in your browser. The source is available on Codeberg at <a href="https://codeberg.org/teddit/teddit">https://codeberg.org/teddit/teddit</a>. <a href="https://github.com/libreddit/libreddit/issues/871#issuecomment-1856544584", target="_blank", style="color:#fbad41" >This instance utilizes Cloudflare Warp to avoid rate limiting. Please be aware of the privacy implications.</a> The instance is hosted only to mitigate bad experiences on a bad platform. Seek greener pastures!
+        p Teddit is a free and open source alternative Reddit front-end focused on privacy. Teddit doesn't require you to have JavaScript enabled in your browser. The source is available on Codeberg at <a href="https://codeberg.org/teddit/teddit">https://codeberg.org/teddit/teddit</a>. <a href="https://github.com/libreddit/libreddit/issues/870#issuecomment-1856548416", target="_blank", style="color:#fbad41" >This instance utilizes Cloudflare Warp to avoid rate limiting. Please be aware of the privacy implications.</a> The instance is hosted only to mitigate bad experiences on a bad platform. Seek greener pastures!
         ul
           li No JavaScript or ads
           li All requests go through the backend, client never talks to Reddit

templates/compose/libremdb.yaml.j2

@@ -17,10 +17,10 @@ services:
       - AXIOS_LANGUAGE='en-US,en;q=0.5'
     ports:
       - 8905:3000
-    restart: unless-stopped 
+    restart: unless-stopped
     networks:
       - libremdb
 
 networks:
   libremdb:
-    name: libremdb
+    name: libremdb

templates/compose/redlib.yaml.j2

@@ -1,10 +1,11 @@
 # {{ ansible_managed }}
 version: '3.7'
 services:
-  libreddit:
+  redlib:
-    container_name: libreddit
+    container_name: redlib
-    image: libreddit/libreddit:arm
+    image: quay.io/redlib/redlib:latest-arm
     security_opt:
+      #- seccomp="seccomp-redlib.json"
       - no-new-privileges
     environment:
       - PUID=1000
@@ -12,6 +13,8 @@ services:
       - TZ=Asia/Singapore
       - LIBREDDIT_DEFAULT_THEME=black
       - LIBREDDIT_DEFAULT_SHOW_NSFW=on
+      - REDLIB_DEFAULT_THEME=black
+      - REDLIB_DEFAULT_SHOW_NSFW=on
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"]
@@ -20,8 +23,8 @@ services:
     ports:
       - 8882:8080
     networks:
-      - libreddit
+      - redlib
 
 networks:
-  libreddit:
+  redlib:
-    name: libreddit
+    name: redlib

templates/conf/Caddyfile.j2

@@ -145,7 +145,17 @@
 	@l host l.{$HOSTNAME}
 	handle @l {
 		encode zstd gzip
-		reverse_proxy {{ vultr_private_ip }}:8882
+		reverse_proxy {
+			to {{ oracle1_private_ip }}:8882
+			to {{ oracle2_private_ip }}:8882
+			to {{ oracle3_private_ip }}:8882
+			to {{ oracle4_private_ip }}:8882
+			lb_policy ip_hash
+			lb_try_duration 5s
+			lb_try_interval 1s
+			fail_duration 30s
+			max_fails 3
+		}
 		header {
 			Content-Security-Policy "default-src 'self';base-uri 'self';block-all-mixed-content;font-src 'self' https: data:;frame-ancestors 'self';img-src 'self' data:;object-src 'none';script-src 'self';script-src-attr 'none';style-src 'self' https: 'unsafe-inline';upgrade-insecure-requests"
 			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"
@@ -362,17 +372,7 @@
 	@z host z.{$HOSTNAME}
 	handle @z {
 		encode zstd gzip
-		reverse_proxy {
+		reverse_proxy {{ oracle3_private_ip }}:8897
-			to {{ oracle1_private_ip }}:8897
-			to {{ oracle2_private_ip }}:8897
-			to {{ oracle3_private_ip }}:8897
-			to {{ oracle4_private_ip }}:8897
-			lb_policy ip_hash
-			lb_try_duration 5s
-			lb_try_interval 1s
-			fail_duration 30s
-			max_fails 3
-		}
 		header {
 			X-Permitted-Cross-Domain-Policies "none"
 			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"

templates/conf/nitter/nitter.conf.j2

@@ -41,7 +41,7 @@ tokenCount = 10
 theme = "auto_(Twitter)"
 replaceTwitter = "n.opnxng.com"
 replaceYouTube = "invidious.fdn.fr"
-replaceReddit = "i.opnxng.com"
+replaceReddit = "l.opnxng.com"
 replaceInstagram = ""
 proxyVideos = true
 hlsPlayback = false

templates/conf/settings.yml.j2

@@ -217,9 +217,9 @@ hostname_replace:
   '(.*\.)?youtube\.com$':           'invidious.fdn.fr'
   '(.*\.)?youtu\.be$':              'invidious.fdn.fr'
   '(.*\.)?youtube-noocookie\.com$': 'invidious.fdn.fr'
-  '(.*\.)?reddit\.com$':            'i.opnxng.com'
+  '(.*\.)?reddit\.com$':            'l.opnxng.com'
-  '(.*\.)?redd\.it$':               'i.opnxng.com'
+  '(.*\.)?redd\.it$':               'l.opnxng.com'
-  '(.*\.)?libi.opnxng\.com$':       'l.opnxng.com'
+#  '(.*\.)?libi.opnxng\.com$':       'l.opnxng.com'
 #  '(.*\.)?reddit\.com$':            'old.reddit.com'
 #  '(.*\.)?redd\.it$':               'old.reddit.com'
   '(.*\.)?medium\.com$':            'm.opnxng.com'

vars/services.yaml

@@ -1,17 +1,18 @@
-config:
-  oracle4:
-    - caddy
-
 compose:
   oracle4:
-    - caddy
+    - nitter
+    - paulgo
+
+config:
+  oracle4:
+    - nitter
+    - paulgo
 
 # ----------------------------------------------------------------------------------------------------
 
 
 deployed-compose:
   vultr:
-    - libreddit
     - teddit
     - cloudtube
     - imgin
@@ -22,7 +23,7 @@ deployed-compose:
     - send
     - privatebin
     ####################
-    - breezewiki
+    - redlib
     - voyager
     - mlmym
     - photon
@@ -45,7 +46,7 @@ deployed-compose:
     - firefox
     - wolfree
     ####################
-    - breezewiki
+    - redlib
     - voyager
     - mlmym
     - photon
@@ -69,8 +70,9 @@ deployed-compose:
     - gitea
     - runner
     - ntfy
-    ####################
     - breezewiki
+    ####################
+    - redlib
     - voyager
     - mlmym
     - photon
@@ -96,7 +98,7 @@ deployed-compose:
     - authelia
     - geoipupdate
     ####################
-    - breezewiki
+    - redlib
     - voyager
     - mlmym
     - photon
@@ -126,22 +128,20 @@ deployed-config:
     - anonymousoverflow
     - scribe
     - priviblur
-    - breezewiki
   oracle2:
     - firefox
     - anonymousoverflow
     - scribe
     - priviblur
-    - breezewiki
   oracle3:
     - ntfy
     - gitea
     - gitea-netrc
     - runner
-    - breezewiki
     - anonymousoverflow
     - scribe
     - priviblur
+    - breezewiki
   oracle4:
     - authelia
     - nitter
@@ -150,4 +150,3 @@ deployed-config:
     - anonymousoverflow
     - scribe
     - priviblur
-    - breezewiki