From 3d9ff9f9e655dc1f3d5a1addf5682601c4fba6e7 Mon Sep 17 00:00:00 2001
From: Opnxng <opnxng@tuta.io>
Date: Fri, 29 Mar 2024 10:03:21 +0800
Subject: [PATCH] SearXNG: changed instance's name

---
 templates/compose/redlib.yaml.j2 |  6 ++++--
 templates/conf/Caddyfile.j2      | 23 +++++++++++------------
 templates/conf/settings.yml.j2   |  9 +++------
 vars/services.yaml               |  2 --
 4 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/templates/compose/redlib.yaml.j2 b/templates/compose/redlib.yaml.j2
index e8edca0..d54640d 100644
--- a/templates/compose/redlib.yaml.j2
+++ b/templates/compose/redlib.yaml.j2
@@ -3,8 +3,8 @@ version: '3.7'
 services:
   redlib:
     container_name: redlib
-    image: quay.io/redlib/redlib:latest
-    #image: quay.io/redlib/redlib:latest-arm
+    #image: quay.io/redlib/redlib:latest
+    image: quay.io/redlib/redlib:latest-arm
     security_opt:
       #- seccomp="seccomp-redlib.json"
       - no-new-privileges
@@ -16,6 +16,8 @@ services:
       - LIBREDDIT_DEFAULT_SHOW_NSFW=on
       - REDLIB_DEFAULT_THEME=black
       - REDLIB_DEFAULT_SHOW_NSFW=on
+      - RUST_LOG=redlib=trace #logging on the crate
+      #- RUST_LOG=trace
     restart: unless-stopped
     healthcheck:
       test: ["CMD", "wget", "--spider", "-q", "--tries=1", "http://localhost:8080/settings"]
diff --git a/templates/conf/Caddyfile.j2 b/templates/conf/Caddyfile.j2
index 47104e4..210c419 100755
--- a/templates/conf/Caddyfile.j2
+++ b/templates/conf/Caddyfile.j2
@@ -145,18 +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
-#		}
+		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"
diff --git a/templates/conf/settings.yml.j2 b/templates/conf/settings.yml.j2
index 702ca23..72247fe 100755
--- a/templates/conf/settings.yml.j2
+++ b/templates/conf/settings.yml.j2
@@ -3,7 +3,7 @@ general:
   # Debug mode, only for development. Is overwritten by ${SEARXNG_DEBUG}
   debug: false
   # displayed name
-  instance_name: "SearXNG"
+  instance_name: "OpnXNG"
   # For example: https://example.com/privacy
   privacypolicy_url: false
   # use true to use your own donation page written in searx/info/en/donate.md
@@ -217,11 +217,8 @@ hostname_replace:
   '(.*\.)?youtube\.com$':           'invidious.fdn.fr'
   '(.*\.)?youtu\.be$':              'invidious.fdn.fr'
   '(.*\.)?youtube-noocookie\.com$': 'invidious.fdn.fr'
-  '(.*\.)?reddit\.com$':            'l.opnxng.com'
-  '(.*\.)?redd\.it$':               'l.opnxng.com'
-#  '(.*\.)?libi.opnxng\.com$':       'l.opnxng.com'
-#  '(.*\.)?reddit\.com$':            'old.reddit.com'
-#  '(.*\.)?redd\.it$':               'old.reddit.com'
+  '(.*\.)?reddit\.com$':            'libreddit.bus-hit.me'
+  '(.*\.)?redd\.it$':               'libreddit.bus-hit.me'
   '(.*\.)?medium\.com$':            'm.opnxng.com'
   'fandom\.com$':          'z.opnxng.com'
   'dic\.academic\.ru$':          'akademik.bloat.cat'
diff --git a/vars/services.yaml b/vars/services.yaml
index b512e53..84a06d5 100644
--- a/vars/services.yaml
+++ b/vars/services.yaml
@@ -5,8 +5,6 @@ config:
 compose:
   oracle4:
     - paulgo
-  vultr:
-    - teddit
 
 # ----------------------------------------------------------------------------------------------------