git.iko.soy/searx
on master help sign in
utils/lxc.env: separate environment that is used in containers
491cb95Markus Heiser
Makefile+1
compare with master
unifiedsplit
@@ -89,6 +89,7 @@ test.sh:
89 shellcheck -x utils/searx.sh
89 shellcheck -x utils/searx.sh
90 shellcheck -x utils/morty.sh
90 shellcheck -x utils/morty.sh
91 shellcheck -x utils/lxc.sh
91 shellcheck -x utils/lxc.sh
92+ shellcheck -x utils/lxc.env
92 shellcheck -x .config.sh
93 shellcheck -x .config.sh
93
94
94test.pep8: pyenvinstall
95test.pep8: pyenvinstall
utils/filtron.sh+1
@@ -6,6 +6,7 @@
6# shellcheck source=utils/lib.sh
6# shellcheck source=utils/lib.sh
7source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
7source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
8source_dot_config
8source_dot_config
9+source "${REPO_ROOT}/utils/lxc.env"
9
10
10# ----------------------------------------------------------------------------
11# ----------------------------------------------------------------------------
11# config
12# 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 @@
5# shellcheck source=utils/lib.sh
5# shellcheck source=utils/lib.sh
6source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
6source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
7source_dot_config
7source_dot_config
8+source "${REPO_ROOT}/utils/lxc.env"
8
9
9# ----------------------------------------------------------------------------
10# ----------------------------------------------------------------------------
10# config
11# config
@@ -63,12 +64,6 @@ HOST_USER="${SUDO_USER:-$USER}"
63HOST_USER_ID=$(id -u "${HOST_USER}")
64HOST_USER_ID=$(id -u "${HOST_USER}")
64HOST_GROUP_ID=$(id -g "${HOST_USER}")
65HOST_GROUP_ID=$(id -g "${HOST_USER}")
65
66
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−
72# ----------------------------------------------------------------------------
67# ----------------------------------------------------------------------------
73usage() {
68usage() {
74# ----------------------------------------------------------------------------
69# ----------------------------------------------------------------------------
utils/morty.sh+1
@@ -5,6 +5,7 @@
5# shellcheck source=utils/lib.sh
5# shellcheck source=utils/lib.sh
6source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
6source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
7source_dot_config
7source_dot_config
8+source "${REPO_ROOT}/utils/lxc.env"
8
9
9# ----------------------------------------------------------------------------
10# ----------------------------------------------------------------------------
10# config
11# config
utils/searx.sh+1
@@ -6,6 +6,7 @@
6# shellcheck source=utils/lib.sh
6# shellcheck source=utils/lib.sh
7source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
7source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
8source_dot_config
8source_dot_config
9+source "${REPO_ROOT}/utils/lxc.env"
9
10
10# ----------------------------------------------------------------------------
11# ----------------------------------------------------------------------------
11# config
12# config