Merge pull request #2717 from 3nprob/configure-config-paths
Allow overriding env vars SEARX_SETTINGS_PATH,UWSGI_SETTINGS_PATH
commit5d5ecdb745fb4e841d2070d3759d33cf2b12b06d
authorNoémi Ványi <kvch@users.noreply.github.com>
dateFri 9 Apr 2021, 12:48 (6 years ago)
parentcc359340fb423e
Dockerfile+3−1
@@ -14,7 +14,9 @@ ENV INSTANCE_NAME=searx \
1414 AUTOCOMPLETE= \
1515 BASE_URL= \
1616 MORTY_KEY= \
17− MORTY_URL=
17+ MORTY_URL= \
18+ SEARX_SETTINGS_PATH=/etc/searx/settings.yml \
19+ UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini
1820
1921WORKDIR /usr/local/searx
2022
dockerfiles/docker-entrypoint.sh−3
@@ -24,9 +24,6 @@ if [ -z "${BIND_ADDRESS}" ]; then
2424 export BIND_ADDRESS="${DEFAULT_BIND_ADDRESS}"
2525fi
2626
27−export UWSGI_SETTINGS_PATH=/etc/searx/uwsgi.ini
28−export SEARX_SETTINGS_PATH=/etc/searx/settings.yml
29−
3027# Parse special command line
3128# see docs/admin/installation-docker.rst
3229# display the help message without the version
utils/searx.sh+1−1
@@ -35,7 +35,7 @@ SERVICE_GROUP="${SERVICE_USER}"
3535GIT_BRANCH="${GIT_BRANCH:-master}"
3636SEARX_PYENV="${SERVICE_HOME}/searx-pyenv"
3737SEARX_SRC="${SERVICE_HOME}/searx-src"
38−SEARX_SETTINGS_PATH="/etc/searx/settings.yml"
38+SEARX_SETTINGS_PATH="${SEARX_SETTINGS_PATH:-/etc/searx/settings.yml}"
3939SEARX_SETTINGS_TEMPLATE="${SEARX_SETTINGS_TEMPLATE:-${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml}"
4040SEARX_UWSGI_APP="searx.ini"
4141# shellcheck disable=SC2034