You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		3 years ago
..
engines	[fix] utils/build_env.py and add documentation	3 years ago
api.rst	[mod] normalize .config.sh with settings.yml	3 years ago
arch_public.dot	[brand] searxng -- fix links to issue tracker & WEB-GUI	3 years ago
architecture.rst	[brand] searxng -- fix links to issue tracker & WEB-GUI	3 years ago
buildhosts.rst	[doc] modify docs to fit to the new build boilerplate	3 years ago
filtron.rst	Fix security vulnerabilities in suggested nginx configuration	3 years ago
index.rst	[docs] move 'settings.yml' into admin's 'Engines & Settings'	3 years ago
installation-apache.rst	[doc] improve admin-docs about result proxy (morty) configuration	3 years ago
installation-docker.rst	[doc] docker: revision and preparation of the documentation	3 years ago
installation-nginx.rst	Fix security vulnerabilities in suggested nginx configuration	3 years ago
installation-searx.rst	[fix] utils/build_env.py and add documentation	3 years ago
installation-uwsgi.rst	[fix] markup of auto generated installation instruction (uWSGI part)	4 years ago
installation.rst	[doc] admin manual - describe installation of external plugins	3 years ago
morty.rst	[doc] improve admin-docs about result proxy (morty) configuration	3 years ago
plugins.rst	[mod] documentation: change the jinja context doesn't depend on searx.webapp	3 years ago
update-searx.rst	[fix doc] manage.sh update_packages does not exists anymore	3 years ago