git.iko.soy/searx
on master help sign in
[fix] use SEARX_SETTINGS_TEMPLATE from .config environment

In commit a70b9b9f the SEARX_SETTINGS_TEMPLATE environment was added to the .config file, but was not use in utils/searx.sh. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commit0fc3759d74a84229d9db39693d2b14a1b85320e0 authorMarkus Heiser <markus.heiser@darmarit.de> dateWed 23 Dec 2020, 14:10 (6 years ago) parentc2aaf6f
1 file changed+3−3
compare with master
unifiedsplit
utils/searx.sh+3−3
utils/searx.sh+3−3
@@ -36,7 +36,7 @@ GIT_BRANCH="${GIT_BRANCH:-master}"
3636SEARX_PYENV="${SERVICE_HOME}/searx-pyenv"
3737SEARX_SRC="${SERVICE_HOME}/searx-src"
3838SEARX_SETTINGS_PATH="/etc/searx/settings.yml"
39−SEARX_SETTINGS_TEMPLATE="${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml"
39+SEARX_SETTINGS_TEMPLATE="${SEARX_SETTINGS_TEMPLATE:-${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml}"
4040SEARX_UWSGI_APP="searx.ini"
4141# shellcheck disable=SC2034
4242SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
@@ -157,7 +157,7 @@ install / remove
157157 :searx-src: clone $GIT_URL
158158 :pyenv: create/remove virtualenv (python) in $SEARX_PYENV
159159 :uwsgi: install searx uWSGI application
160− :settings: reinstall settings from ${REPO_ROOT}/searx/settings.yml
160+ :settings: reinstall settings from ${SEARX_SETTINGS_TEMPLATE}
161161 :packages: install needed packages from OS package manager
162162 :buildhost: install packages from OS package manager needed by buildhosts
163163update searx
@@ -412,7 +412,7 @@ install_settings() {
412412 mkdir -p "$(dirname ${SEARX_SETTINGS_PATH})"
413413
414414 if [[ ! -f ${SEARX_SETTINGS_PATH} ]]; then
415− info_msg "install settings ${REPO_ROOT}/searx/settings.yml"
415+ info_msg "install settings ${SEARX_SETTINGS_TEMPLATE}"
416416 info_msg " --> ${SEARX_SETTINGS_PATH}"
417417 cp "${SEARX_SETTINGS_TEMPLATE}" "${SEARX_SETTINGS_PATH}"
418418 configure_searx