From dce7b7d0cc9ef169da299e9f0169984731fac26e Mon Sep 17 00:00:00 2001
From: ange <ange@yw5n.com>
Date: Wed, 15 May 2024 23:31:25 +0200
Subject: [PATCH] fix: writable /etc/searxng

---
 .env                      |  2 +-
 config/uwsgi.ini          | 54 ---------------------------------------
 diff.sh                   |  4 ++-
 manifests/bin/deploy.sh   | 10 +++-----
 manifests/common/app.yaml |  6 ++++-
 5 files changed, 12 insertions(+), 64 deletions(-)
 delete mode 100644 config/uwsgi.ini

diff --git a/.env b/.env
index a9b6aa8..d74d858 100644
--- a/.env
+++ b/.env
@@ -1,2 +1,2 @@
 PROD_URL=searx.gmoker.com
-IMAGEAPP=docker.io/searxng/searxng:2024.5.15-645a840d8
+IMAGEAPP=docker.io/searxng/searxng:2024.5.15-949a73103
diff --git a/config/uwsgi.ini b/config/uwsgi.ini
deleted file mode 100644
index 9db3d76..0000000
--- a/config/uwsgi.ini
+++ /dev/null
@@ -1,54 +0,0 @@
-[uwsgi]
-# Who will run the code
-uid = searxng
-gid = searxng
-
-# Number of workers (usually CPU count)
-# default value: %k (= number of CPU core, see Dockerfile)
-workers = %k
-
-# Number of threads per worker
-# default value: 4 (see Dockerfile)
-threads = 4
-
-# The right granted on the created socket
-chmod-socket = 666
-
-# Plugin to use and interpreter config
-single-interpreter = true
-master = true
-plugin = python3
-lazy-apps = true
-enable-threads = 4
-
-# Module to import
-module = searx.webapp
-
-# Virtualenv and python path
-pythonpath = /usr/local/searxng/
-chdir = /usr/local/searxng/searx/
-
-# automatically set processes name to something meaningful
-auto-procname = true
-
-# Disable request logging for privacy
-disable-logging = true
-log-5xx = true
-
-# Set the max size of a request (request-body excluded)
-buffer-size = 8192
-
-# No keep alive
-# See https://github.com/searx/searx-docker/issues/24
-add-header = Connection: close
-
-# Follow SIGTERM convention
-# See https://github.com/searxng/searxng/issues/3427
-die-on-term
-
-# uwsgi serves the static files
-static-map = /static=/usr/local/searxng/searx/static
-# expires set to one day
-static-expires = /* 86400
-static-gzip-all = True
-offload-threads = 4
diff --git a/diff.sh b/diff.sh
index 4de20d1..032bed1 100755
--- a/diff.sh
+++ b/diff.sh
@@ -8,6 +8,8 @@ REPO='https://github.com/searxng/searxng/raw'
 new_tag="$(curl -L "$DOCKER_API/tags" | jq -r '.results[3].name')"
 new_commit="$(grep -Eo '\w+$' <<< "$new_tag")"
 
-$EDITOR -d -c "wincmd l" -- "$REPO/$new_commit/searx/settings.yml" settings.yml
+for f in config/*; do
+    $EDITOR -d -c "wincmd l" -- "$REPO/$new_commit/searx/${f##*/}" "$f"
+done
 
 sed -i "/^IMAGEAPP=/s/:.*/:$new_tag/" .env
diff --git a/manifests/bin/deploy.sh b/manifests/bin/deploy.sh
index c71f932..cb74842 100755
--- a/manifests/bin/deploy.sh
+++ b/manifests/bin/deploy.sh
@@ -34,13 +34,9 @@ function kgcmkey() {
 kcreatesec searxng-secrets \
     --from-literal=SEARXNG_SECRET="$(kgseckey searxng-secrets SEARXNG_SECRET || openssl rand -hex 32)"
 
-(cd config
-    cmd=(kcreatecm searxng)
-    for f in *; do
-        cmd+=("--from-file=$f=<(envsubst \"\$(env | xargs printf '$%s ')\" < $f)")
-    done
-    eval "${cmd[*]}"
-)
+kcreatecm searxng \
+    --from-file=config/settings.yml \
+    --from-file=config/limiter.toml
 
 kapply common/redis.yaml common/app.yaml
 
diff --git a/manifests/common/app.yaml b/manifests/common/app.yaml
index 9eced47..070251b 100644
--- a/manifests/common/app.yaml
+++ b/manifests/common/app.yaml
@@ -71,7 +71,11 @@ spec:
                 name: searxng-secrets
           volumeMounts:
             - name: config
-              mountPath: /etc/searxng/
+              mountPath: /etc/searxng/limiter.toml
+              subPath: limiter.toml
+            - name: config
+              mountPath: /etc/searxng/settings.yml
+              subPath: settings.yml
       volumes:
         - name: config
           configMap: