git.iko.soy/searx
on master help sign in
utils/lxc.env: separate environment that is used in containers

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commit491cb95a1f910e17ac022ddfa73b68aae2fbc6e2 authorMarkus Heiser <markus.heiser@darmarit.de> dateSun 1 Mar 2020, 18:28 (7 years ago) parent37c135f
6 files changed+19−6
compare with master
unifiedsplit
Makefile+1 utils/filtron.sh+1 utils/lxc.env+14 utils/lxc.sh+1−6 utils/morty.sh+1 utils/searx.sh+1
Makefile+1
@@ -89,6 +89,7 @@ test.sh:
8989 shellcheck -x utils/searx.sh
9090 shellcheck -x utils/morty.sh
9191 shellcheck -x utils/lxc.sh
92+ shellcheck -x utils/lxc.env
9293 shellcheck -x .config.sh
9394
9495test.pep8: pyenvinstall
utils/filtron.sh+1
@@ -6,6 +6,7 @@
66# shellcheck source=utils/lib.sh
77source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
88source_dot_config
9+source "${REPO_ROOT}/utils/lxc.env"
910
1011# ----------------------------------------------------------------------------
1112# config
utils/lxc.envnew file+14
@@ -0,0 +1,14 @@
1+# -*- coding: utf-8; mode: sh indent-tabs-mode: nil -*-
2+# SPDX-License-Identifier: AGPL-3.0-or-later
3+
4+# Herein we place all, what is needed to know when inside containers. Its
5+# sourced from different context --> do not manipulate the environment directly,
6+# implement functions!
7+
8+# shellcheck shell=sh
9+
10+searx_suite_set_env() {
11+ export FILTRON_API="0.0.0.0:4005"
12+ export FILTRON_LISTEN="0.0.0.0:4004"
13+ export MORTY_LISTEN="0.0.0.0:3000"
14+}
utils/lxc.sh+1−6
@@ -5,6 +5,7 @@
55# shellcheck source=utils/lib.sh
66source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
77source_dot_config
8+source "${REPO_ROOT}/utils/lxc.env"
89
910# ----------------------------------------------------------------------------
1011# config
@@ -63,12 +64,6 @@ HOST_USER="${SUDO_USER:-$USER}"
6364HOST_USER_ID=$(id -u "${HOST_USER}")
6465HOST_GROUP_ID=$(id -g "${HOST_USER}")
6566
66−searx_suite_set_env() {
67− export FILTRON_API="0.0.0.0:4005"
68− export FILTRON_LISTEN="0.0.0.0:4004"
69− export MORTY_LISTEN="0.0.0.0:3000"
70−}
71−
7267# ----------------------------------------------------------------------------
7368usage() {
7469# ----------------------------------------------------------------------------
utils/morty.sh+1
@@ -5,6 +5,7 @@
55# shellcheck source=utils/lib.sh
66source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
77source_dot_config
8+source "${REPO_ROOT}/utils/lxc.env"
89
910# ----------------------------------------------------------------------------
1011# config
utils/searx.sh+1
@@ -6,6 +6,7 @@
66# shellcheck source=utils/lib.sh
77source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
88source_dot_config
9+source "${REPO_ROOT}/utils/lxc.env"
910
1011# ----------------------------------------------------------------------------
1112# config