summaryrefslogtreecommitdiff
path: root/manage
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2021-06-29 19:46:06 +0200
committerMarkus Heiser <markus.heiser@darmarit.de>2021-07-21 14:38:54 +0200
commit2964a24b3d82651cfd9e30f2ba659bf0f5b2579a (patch)
tree701e6577112fc0dbcb0b33f06c7ced2e36bc547f /manage
parent414a6105e7793e9499c64dd649eda43250971c50 (diff)
downloadsearxng-2964a24b3d82651cfd9e30f2ba659bf0f5b2579a.tar.gz
searxng-2964a24b3d82651cfd9e30f2ba659bf0f5b2579a.zip
[fix] utils/build_env.py and add documentation
modified docs/admin/engines/settings.rst - Fix documentation and add section 'brand'. - Add remarks about **buildenv** variables. - Add remarks about settings from environment variables $SEARX_DEBUG, $SEARX_PORT, $SEARX_BIND_ADDRESS and $SEARX_SECRET modified docs/admin/installation-searx.rst & docs/build-templates/searx.rst Fix template location /templates/etc/searx/settings.yml modified docs/dev/makefile.rst Add description of the 'make buildenv' target and describe - we have all SearXNG setups are centralized in the settings.yml file - why some tasks need a utils/brand.env (aka instance's buildenv) modified manage Settings file from repository's working tree are used by default and ask user if a /etc/searx/settings.yml file exists. modified searx/settings.yml Add comments about when it is needed to run 'make buildenv' modified searx/settings_defaults.py Default for server:port is taken from enviroment variable SEARX_PORT. modified utils/build_env.py - Some defaults in the settings.yml are taken from the environment, e.g. SEARX_BIND_ADDRESS (searx.settings_defaults.SHEMA). When the 'brand.env' file is created these enviroment variables should be unset first. - The CONTACT_URL enviroment is not needed in the utils/brand.env Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'manage')
-rwxr-xr-xmanage10
1 files changed, 10 insertions, 0 deletions
diff --git a/manage b/manage
index f03343839..a67bdc74e 100755
--- a/manage
+++ b/manage
@@ -105,6 +105,16 @@ fi
export DOCS_BUILD
buildenv() {
+
+ # settings file from repository's working tree are used by default
+ SEARX_SETTINGS_PATH="${REPO_ROOT}/searx/settings.yml"
+
+ if [ -r '/etc/searx/settings.yml' ]; then
+ if ask_yn "should settings read from: /etc/searx/settings.yml"; then
+ SEARX_SETTINGS_PATH='/etc/searx/settings.yml'
+ fi
+ fi
+ export SEARX_SETTINGS_PATH
SEARX_DEBUG=1 pyenv.cmd python utils/build_env.py 2>&1 \
| prefix_stdout "${_Blue}BUILDENV${_creset} "
return "${PIPESTATUS[0]}"