Removed 4get

config-tasks/paulgo.yaml

@@ -7,8 +7,8 @@
 
     - name: Set up paulgo conf
       template:
-        src: "conf/settings.yaml.j2"
-        dest: "{{ docker_dir }}/paulgo/settings.yaml"
+        src: "conf/settings.yml.j2"
+        dest: "{{ docker_dir }}/paulgo/settings.yml"
         owner: 1000
         group: 1000
         mode: 0755
@@ -19,4 +19,4 @@
         dest: "{{ docker_dir }}/paulgo/donate.md"
         owner: 1000
         group: 1000
-        mode: 0755
+        mode: 0755

templates/compose/paulgo.yaml.j2

@@ -35,7 +35,7 @@ services:
     depends_on:
       - redis
     volumes:
-      - {{ docker_dir }}/paulgo/settings.yaml:/usr/local/searxng/searx/settings.yaml
+      - {{ docker_dir }}/paulgo/settings.yml:/usr/local/searxng/searx/settings.yml
       - {{ docker_dir }}/paulgo/donate.md:/usr/local/searxng/searx/infopage/en/donate.md
     network_mode: host
 

templates/conf/Caddyfile.j2

@@ -544,29 +544,29 @@
 		}
 	}
 
-	@4g host 4g.{$HOSTNAME}
-	handle @4g {
-		encode zstd gzip
-		@notstatic {
-			not path /static/* /android-chrome* /favicon* /robots.txt /banner/* /site.webmanifest
-		}
-		rate_limit @notstatic {remote.ip} 2r/s 60000 500
-		rate_limit @notstatic {remote.ip} 45r/m 300000 500
-		reverse_proxy {
-			to {{ oracle1_private_ip }}:8907
-			to {{ oracle2_private_ip }}:8907
-			to {{ oracle3_private_ip }}:8907
-			to {{ oracle4_private_ip }}:8907
-			lb_policy ip_hash
-			lb_try_duration 5s
-			lb_try_interval 1s
-			fail_duration 30s
-			max_fails 3
-		}
-		header {
-			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"
-		}
-	}
+#	@4g host 4g.{$HOSTNAME}
+#	handle @4g {
+#		encode zstd gzip
+#		@notstatic {
+#			not path /static/* /android-chrome* /favicon* /robots.txt /banner/* /site.webmanifest
+#		}
+#		rate_limit @notstatic {remote.ip} 2r/s 60000 500
+#		rate_limit @notstatic {remote.ip} 45r/m 300000 500
+#		reverse_proxy {
+#			to {{ oracle1_private_ip }}:8907
+#			to {{ oracle2_private_ip }}:8907
+#			to {{ oracle3_private_ip }}:8907
+#			to {{ oracle4_private_ip }}:8907
+#			lb_policy ip_hash
+#			lb_try_duration 5s
+#			lb_try_interval 1s
+#			fail_duration 30s
+#			max_fails 3
+#		}
+#		header {
+#			X-Robots-Tag "noindex, noimageindex, nosnippet, notranslate, noarchive, nofollow"
+#		}
+#	}
 
 	@ig host ig.{$HOSTNAME}
 	handle @ig {
@@ -663,4 +663,4 @@ i.r.{$HOSTNAME} {
 	handle {
 		abort
 	}
-}
+}

templates/conf/settings.yml.j2

@@ -76,7 +76,7 @@ server:
   base_url: "https://opnxng.com"
   public_instance: true
 
-  # If your instance owns a /etc/searxng/settings.yaml file, then set the following
+  # If your instance owns a /etc/searxng/settings.yml file, then set the following
   # values there.
   secret_key: "{{ paulgo_jwt_secret }}"  # Is overwritten by ${SEARXNG_SECRET}
   # Proxying image results through searx
@@ -2540,4 +2540,4 @@ doi_resolvers:
 
 default_doi_resolver: 'oadoi.org'
 
-{% endraw %}
+{% endraw %}

vars/services.yaml

@@ -1,14 +1,10 @@
-compose:
-  vultr:
-    - 4get
-  oracle1:
-    - 4get
-  oracle2:
-    - 4get
-  oracle3:
-    - 4get
+config:
   oracle4:
-    - 4get
+    - paulgo
+
+compose:
+  oracle4:
+    - paulgo
 
 # ----------------------------------------------------------------------------------------------------