diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2021-10-11 10:56:50 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarIT.de> | 2021-10-11 12:28:55 +0000 |
| commit | 60edf2623d7c1a6b394638c6673c0d981674c570 (patch) | |
| tree | ee18d6ba3b2daf2051f5cecc4f3fcbca6ecf09dd /utils | |
| parent | 3fad483b7a614707fb973c7973d289e364163cfa (diff) | |
| download | searxng-60edf2623d7c1a6b394638c6673c0d981674c570.tar.gz searxng-60edf2623d7c1a6b394638c6673c0d981674c570.zip | |
[brand] SearXNG - reference /etc/searxng/settings.yml
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/lib_install.sh | 4 | ||||
| -rwxr-xr-x | utils/searx.sh | 2 | ||||
| -rw-r--r-- | utils/templates/etc/searxng/settings.yml (renamed from utils/templates/etc/searx/settings.yml) | 5 |
3 files changed, 8 insertions, 3 deletions
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/searxng/settings.yml index 5320b0b2c..dd2a29b3b 100644 --- a/utils/templates/etc/searx/settings.yml +++ b/utils/templates/etc/searxng/settings.yml @@ -21,11 +21,12 @@ search: # use codes from 'languages.py' default_lang: '' # remove format to deny access, use lower case. - formats: [html, csv, json, rss] + formats: + - html server: secret_key: "ultrasecretkey" # change this! - # Proxying image results through searx + # Proxying image results through SearXNG image_proxy: false # result_proxy: |