Markus Heiser f61c918dd4 [mod] normalize .config.sh with settings.yml ... In commit 94851790 we have centralized all SearXNG setups in the settings.yml file: 94851790 [mod] move brand options from Makefile to settings.yml This step has not yet been completed for the installation procedures! Since all SearXNG setups are done in the settings.yml these environment variables needs to be removed from the ./conf.sh file. Scripts and other tasks running outside of an instance got the needed values from the ./utils/brand.env file. By example: ATM the environment variables of the ./config.sh file are in conflict with them from settings.yml: - PUBLIC_URL --> {server:base_url} - SEARX_INTERNAL_HTTP --> {server:bind_address}.{server:port} - GIT_BRANCH --> {brand:GIT_URL} These environment variable of a SearXNG instance and additional - SEARX_SETTINGS_TEMPLATE has been remove from the '.config.sh' file. With this patch, the main focus of ./conf.sh resists on environment variables needed for the installation of morty, filtron software. modified .config.sh: - removed no longer supported variables (see above) - add comment about: SearXNG setup in settings.yml modified utils/searx.sh: - SEARX_INTERNAL_HTTP no longer take from .config.sh - SEARX_SETTINGS_PATH /etc/searx/settings.yml - SEARX_SETTINGS_TEMPLATE obsolete modified utils/lib_install.sh: Initialize environment variables SEARX_PYENV, SEARX_SETTINGS_PATH and PUBLIC_URL. modified: utils/morty.sh Add missing hint about SEARX_SETTINGS_PATH and move PUBLIC_URL to utils/lib_install.sh modified: utils/morty.sh Move PUBLIC_URL to utils/lib_install.sh Renamed utils/templates/etc/searx/use_default_settings.yml -> settings.yml - removed option which can't be modified after installation - add some comments with examples Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>		2021-07-21 14:38:57 +02:00
..
_themes/searx	[fix] sphinx-tabs should not overlap sidebar	2021-05-14 17:19:49 +02:00
admin	[mod] normalize .config.sh with settings.yml	2021-07-21 14:38:57 +02:00
build-templates	[fix] utils/build_env.py and add documentation	2021-07-21 14:38:54 +02:00
dev	[fix] utils/build_env.py and add documentation	2021-07-21 14:38:54 +02:00
searx_extra	Add searx_extra package	2021-03-04 11:59:14 +01:00
src	[docs] add documentation from the sources of the google engines	2021-06-21 18:25:52 +02:00
static/img	[enh] initial structure	2015-11-17 23:38:22 +01:00
user	[mod] replace makefile boilerplate by 'manage' script	2021-04-23 11:26:22 +02:00
utils	[mod] utils/lxc.sh: detect conflict of docker & LXC in the iptables	2021-06-23 12:47:52 +02:00
conf.py	[mod] drop usage of the searx.brand namespace (python procs)	2021-07-18 15:55:42 +02:00
index.rst	[docs] move LXC blog article into developer documentation.	2021-06-04 15:05:58 +02:00