diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2020-03-01 18:28:10 +0100 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2020-03-01 18:28:10 +0100 |
| commit | 491cb95a1f910e17ac022ddfa73b68aae2fbc6e2 (patch) | |
| tree | cb5548c1902a0f98f68cd6a09a327666ac3068e9 /utils | |
| parent | 37c135f2cec6113aa2baaf1b52fe46fd64265975 (diff) | |
| download | searxng-491cb95a1f910e17ac022ddfa73b68aae2fbc6e2.tar.gz searxng-491cb95a1f910e17ac022ddfa73b68aae2fbc6e2.zip | |
utils/lxc.env: separate environment that is used in containers
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/filtron.sh | 1 | ||||
| -rw-r--r-- | utils/lxc.env | 14 | ||||
| -rwxr-xr-x | utils/lxc.sh | 7 | ||||
| -rwxr-xr-x | utils/morty.sh | 1 | ||||
| -rwxr-xr-x | utils/searx.sh | 1 |
5 files changed, 18 insertions, 6 deletions
diff --git a/utils/filtron.sh b/utils/filtron.sh index 663c2b1dc..c53acc607 100755 --- a/utils/filtron.sh +++ b/utils/filtron.sh @@ -6,6 +6,7 @@ # shellcheck source=utils/lib.sh source "$(dirname "${BASH_SOURCE[0]}")/lib.sh" source_dot_config +source "${REPO_ROOT}/utils/lxc.env" # ---------------------------------------------------------------------------- # config diff --git a/utils/lxc.env b/utils/lxc.env new file mode 100644 index 000000000..d470f256c --- /dev/null +++ b/utils/lxc.env @@ -0,0 +1,14 @@ +# -*- coding: utf-8; mode: sh indent-tabs-mode: nil -*- +# SPDX-License-Identifier: AGPL-3.0-or-later + +# Herein we place all, what is needed to know when inside containers. Its +# sourced from different context --> do not manipulate the environment directly, +# implement functions! + +# shellcheck shell=sh + +searx_suite_set_env() { + export FILTRON_API="0.0.0.0:4005" + export FILTRON_LISTEN="0.0.0.0:4004" + export MORTY_LISTEN="0.0.0.0:3000" +} diff --git a/utils/lxc.sh b/utils/lxc.sh index ab9afcbb4..f950cdb1b 100755 --- a/utils/lxc.sh +++ b/utils/lxc.sh @@ -5,6 +5,7 @@ # shellcheck source=utils/lib.sh source "$(dirname "${BASH_SOURCE[0]}")/lib.sh" source_dot_config +source "${REPO_ROOT}/utils/lxc.env" # ---------------------------------------------------------------------------- # config @@ -63,12 +64,6 @@ HOST_USER="${SUDO_USER:-$USER}" HOST_USER_ID=$(id -u "${HOST_USER}") HOST_GROUP_ID=$(id -g "${HOST_USER}") -searx_suite_set_env() { - export FILTRON_API="0.0.0.0:4005" - export FILTRON_LISTEN="0.0.0.0:4004" - export MORTY_LISTEN="0.0.0.0:3000" -} - # ---------------------------------------------------------------------------- usage() { # ---------------------------------------------------------------------------- diff --git a/utils/morty.sh b/utils/morty.sh index e7e2f8651..c3531f735 100755 --- a/utils/morty.sh +++ b/utils/morty.sh @@ -5,6 +5,7 @@ # shellcheck source=utils/lib.sh source "$(dirname "${BASH_SOURCE[0]}")/lib.sh" source_dot_config +source "${REPO_ROOT}/utils/lxc.env" # ---------------------------------------------------------------------------- # config diff --git a/utils/searx.sh b/utils/searx.sh index c435b5c00..1089f30d7 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -6,6 +6,7 @@ # shellcheck source=utils/lib.sh source "$(dirname "${BASH_SOURCE[0]}")/lib.sh" source_dot_config +source "${REPO_ROOT}/utils/lxc.env" # ---------------------------------------------------------------------------- # config |