From 60edf2623d7c1a6b394638c6673c0d981674c570 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Mon, 11 Oct 2021 10:56:50 +0200
Subject: [brand] SearXNG - reference /etc/searxng/settings.yml

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/lib_install.sh                     |  4 +++
 utils/searx.sh                           |  2 +-
 utils/templates/etc/searx/settings.yml   | 52 -------------------------------
 utils/templates/etc/searxng/settings.yml | 53 ++++++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 53 deletions(-)
 delete mode 100644 utils/templates/etc/searx/settings.yml
 create mode 100644 utils/templates/etc/searxng/settings.yml

(limited to 'utils')

diff --git a/utils/lib_install.sh b/utils/lib_install.sh
index dc9ee6993..4fd63b830 100755
--- a/utils/lib_install.sh
+++ b/utils/lib_install.sh
@@ -155,6 +155,10 @@ install_searx_get_state(){
     #    - user:  ${SERVICE_USER}
     #    - pyenv: ${SEARX_PYENV}
 
+    if [ -f /etc/searx/settings.yml ]; then
+        err_msg "settings.yml in /etc/searx/ is deprecated, move file to folder /etc/searxng/"
+    fi
+
     if ! [ -r "${SEARX_SRC}" ]; then
         echo "missing-searx-clone"
         return
diff --git a/utils/searx.sh b/utils/searx.sh
index 41ab3aee5..178a185b6 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -28,7 +28,7 @@ SERVICE_GROUP="${SERVICE_USER}"
 GIT_BRANCH="${GIT_BRANCH:-master}"
 SEARX_PYENV="${SERVICE_HOME}/searx-pyenv"
 SEARX_SRC="${SERVICE_HOME}/searx-src"
-SEARXNG_SETTINGS_PATH="/etc/searx/settings.yml"
+SEARXNG_SETTINGS_PATH="/etc/searxng/settings.yml"
 SEARX_UWSGI_APP="searx.ini"
 # shellcheck disable=SC2034
 SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
diff --git a/utils/templates/etc/searx/settings.yml b/utils/templates/etc/searx/settings.yml
deleted file mode 100644
index 5320b0b2c..000000000
--- a/utils/templates/etc/searx/settings.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-# SearXNG settings, before editing this file read:
-#
-#     https://searxng.github.io/searxng/admin/engines/settings.html
-
-use_default_settings: true
-
-general:
-  # Debug mode, only for development
-  debug: false
-  # change displayed name
-  # instance_name: "SearXNG"
-
-search:
-  # Filter results. 0: None, 1: Moderate, 2: Strict
-  safe_search: 0
-  # Existing autocomplete backends: "dbpedia", "duckduckgo", "google",
-  # "startpage", "swisscows", "qwant", "wikipedia" - leave blank to turn it off
-  # by default.
-  autocomplete: ''
-  # Default search language - leave blank to detect from browser information or
-  # use codes from 'languages.py'
-  default_lang: ''
-  # remove format to deny access, use lower case.
-  formats: [html, csv, json, rss]
-
-server:
-  secret_key: "ultrasecretkey"  # change this!
-  # Proxying image results through searx
-  image_proxy: false
-
-# result_proxy:
-#   url: http://127.0.0.1:3000/
-#   key: !!binary "your_morty_proxy_key"
-
-# plugins:
-#   - only_show_green_results
-
-# engines:
-#
-#   - name: duckduckgo
-#     disabled: false
-#
-#   - name: fdroid
-#     disabled: false
-#
-#   - name: apk mirror
-#     disabled: false
-#
-#   - name: mediathekviewweb
-#     engine: mediathekviewweb
-#     shortcut: mvw
-#     categories: general
diff --git a/utils/templates/etc/searxng/settings.yml b/utils/templates/etc/searxng/settings.yml
new file mode 100644
index 000000000..dd2a29b3b
--- /dev/null
+++ b/utils/templates/etc/searxng/settings.yml
@@ -0,0 +1,53 @@
+# SearXNG settings, before editing this file read:
+#
+#     https://searxng.github.io/searxng/admin/engines/settings.html
+
+use_default_settings: true
+
+general:
+  # Debug mode, only for development
+  debug: false
+  # change displayed name
+  # instance_name: "SearXNG"
+
+search:
+  # Filter results. 0: None, 1: Moderate, 2: Strict
+  safe_search: 0
+  # Existing autocomplete backends: "dbpedia", "duckduckgo", "google",
+  # "startpage", "swisscows", "qwant", "wikipedia" - leave blank to turn it off
+  # by default.
+  autocomplete: ''
+  # Default search language - leave blank to detect from browser information or
+  # use codes from 'languages.py'
+  default_lang: ''
+  # remove format to deny access, use lower case.
+  formats:
+    - html
+
+server:
+  secret_key: "ultrasecretkey"  # change this!
+  # Proxying image results through SearXNG
+  image_proxy: false
+
+# result_proxy:
+#   url: http://127.0.0.1:3000/
+#   key: !!binary "your_morty_proxy_key"
+
+# plugins:
+#   - only_show_green_results
+
+# engines:
+#
+#   - name: duckduckgo
+#     disabled: false
+#
+#   - name: fdroid
+#     disabled: false
+#
+#   - name: apk mirror
+#     disabled: false
+#
+#   - name: mediathekviewweb
+#     engine: mediathekviewweb
+#     shortcut: mvw
+#     categories: general
-- 
cgit v1.2.3-54-g00ecf