Browse Source

utils/lxc.env: separate environment that is used in containers

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Markus Heiser 5 years ago
parent
commit
491cb95a1f
6 changed files with 19 additions and 6 deletions
  1. 1 0
      Makefile
  2. 1 0
      utils/filtron.sh
  3. 14 0
      utils/lxc.env
  4. 1 6
      utils/lxc.sh
  5. 1 0
      utils/morty.sh
  6. 1 0
      utils/searx.sh

+ 1 - 0
Makefile

@@ -89,6 +89,7 @@ test.sh:
 	shellcheck -x utils/searx.sh
 	shellcheck -x utils/morty.sh
 	shellcheck -x utils/lxc.sh
+	shellcheck -x utils/lxc.env
 	shellcheck -x .config.sh
 
 test.pep8: pyenvinstall

+ 1 - 0
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

+ 14 - 0
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"
+}

+ 1 - 6
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() {
 # ----------------------------------------------------------------------------

+ 1 - 0
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

+ 1 - 0
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