diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2021-07-20 13:16:21 +0200 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2021-07-24 16:28:15 +0200 |
| commit | b6a55e223ce0e287adeeafce8164e411154b5423 (patch) | |
| tree | 2aefa8e0614361d4562ea4591e4bb7a89fbc52d8 /utils/morty.sh | |
| parent | 57b8f340a6689fafd0c8d92aebd2b263b090af18 (diff) | |
[mod] reduce enviroment variables in shell scripts to what is needed
Not all settings from the 'brand:' section of the YAML files are needed in the
shell scripts. This patch reduce the variables in ./utils/brand.env to what is
needed. The following ('brand:' settings) can be removed from this file:
- ISSUE_URL
- DOCS_URL
- PUBLIC_INSTANCES
- WIKI_URL
Tasks running outside of an *installed instance*, need the following settings
from the YAML configuration:
- GIT_URL <--> brand.git_url
- GIT_BRANCH <--> brand.git_branch
- SEARX_URL <--> server.base_url (aka PUBLIC_URL)
- SEARX_PORT <--> server.port
- SEARX_BIND_ADDRESS <--> server.bind_address
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'utils/morty.sh')
| -rwxr-xr-x | utils/morty.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/utils/morty.sh b/utils/morty.sh index ccf920273..8be0e6ba6 100755 --- a/utils/morty.sh +++ b/utils/morty.sh @@ -12,7 +12,6 @@ source "${REPO_ROOT}/utils/lib_install.sh" MORTY_LISTEN="${MORTY_LISTEN:-127.0.0.1:3000}" PUBLIC_URL_PATH_MORTY="${PUBLIC_URL_PATH_MORTY:-/morty/}" - PUBLIC_URL_MORTY="${PUBLIC_URL_MORTY:-$(echo "$PUBLIC_URL" | sed -e's,^\(.*://[^/]*\).*,\1,g')${PUBLIC_URL_PATH_MORTY}}" # shellcheck disable=SC2034 @@ -111,7 +110,7 @@ info_searx() { # shellcheck disable=SC1117 cat <<EOF To activate result and image proxy in SearXNG read: - ${DOCS_URL}/admin/morty.html + https://searxng.github.io/searxng/admin/morty.html Check settings in file ${SEARX_SETTINGS_PATH} ... result_proxy: url : ${PUBLIC_URL_MORTY} |