cd9b877 · searx · git.iko.soy

git.iko.soy/searx

utils/searx.sh & filtron.sh: misc changes from first tests (WIP)

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

commitcd9b877c8c186925e7eab5088554fcf5fc2ca5d5 authorMarkus Heiser <markus.heiser@darmarit.de> dateFri 31 Jan 2020, 15:53 (7 years ago) parent6274a54

4 files changed+11−6

compare with master

unifiedsplit

utils/dot_config+4−3 utils/filtron.sh+4−2 utils/lib.sh+1−1 utils/searx.sh+2

utils/dot_config+4−3

@@ -1,8 +1,9 @@

11# -*- coding: utf-8; mode: sh -*-

22# SPDX-License-Identifier: AGPL-3.0-or-later

33#

4−# Set environment used by ./utils scripts like filtron.sh or searx.sh

4+# environment used by utils scripts like filtron.sh or searx.sh

55#

7−# Public URL of the searx instance

8−PUBLIC_URL="${PUBLIC_URL:-https://$(uname -n)/searx}"

7+# the public URL of the searx instance

8+PUBLIC_URL="${PUBLIC_URL:-http://$(uname -n)/searx}"

9+PUBLIC_HOST="${PUBLIC_HOST:-$(echo "$PUBLIC_URL" | sed -e 's/[^/]*\/\/$[^@]*@$\?$[^:/]*$.*/\2/')}"

utils/filtron.sh+4−2

@@ -1,7 +1,7 @@

11#!/usr/bin/env bash

22# -*- coding: utf-8; mode: sh indent-tabs-mode: nil -*-

33# SPDX-License-Identifier: AGPL-3.0-or-later

4−# shellcheck disable=SC2119

4+# shellcheck disable=SC2119,SC2001

66# shellcheck source=utils/lib.sh

77source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"

@@ -84,7 +84,8 @@ apache

8484If needed change the environment variable PUBLIC_URL of your WEB service in the

8585${DOT_CONFIG#"$REPO_ROOT/"} file:

8686

87− PUBLIC_URL : ${PUBLIC_URL}

87+ PUBLIC_URL : ${PUBLIC_URL}

88+ PUBLIC_HOST : ${PUBLIC_HOST}

8889

8990EOF

9091 [ ! -z ${1+x} ] && echo -e "$1"

@@ -335,6 +336,7 @@ inspect_service() {

335336sourced ${DOT_CONFIG#"$REPO_ROOT/"} :

336337

337338 PUBLIC_URL : ${PUBLIC_URL}

339+ PUBLIC_HOST : ${PUBLIC_HOST}

338340 FILTRON_URL_PATH : ${FILTRON_URL_PATH}

339341 FILTRON_API : ${FILTRON_API}

340342 FILTRON_LISTEN : ${FILTRON_LISTEN}

utils/lib.sh+1−1

@@ -440,7 +440,7 @@ service_is_available() {

440440 case "$http_code" in

441441 404|410|423) exit_val=$http_code;;

442442 esac

443− return $exit_val

443+ return "$exit_val"

444444}

445445

446446

utils/searx.sh+2

@@ -102,6 +102,7 @@ If needed change the environment variable PUBLIC_URL of your WEB service in the

102102${DOT_CONFIG#"$REPO_ROOT/"} file:

103103

104104 PUBLIC_URL : ${PUBLIC_URL}

105+ PUBLIC_HOST : ${PUBLIC_HOST}

105106 SEARX_INSTANCE_NAME : ${SEARX_INSTANCE_NAME}

106107

107108EOF

@@ -481,6 +482,7 @@ inspect_service() {

481482sourced ${DOT_CONFIG#"$REPO_ROOT/"} :

482483

483484 PUBLIC_URL : ${PUBLIC_URL}

485+ PUBLIC_HOST : ${PUBLIC_HOST}

484486 SEARX_URL_PATH : ${SEARX_URL_PATH}

485487 SEARX_INSTANCE_NAME : ${SEARX_INSTANCE_NAME}

486488 SEARX_INTERNAL_URL : ${SEARX_INTERNAL_URL}