diff options
| -rw-r--r-- | docs/admin/update-searxng.rst | 14 | ||||
| -rwxr-xr-x | utils/filtron.sh | 9 | ||||
| -rwxr-xr-x | utils/morty.sh | 7 | ||||
| -rwxr-xr-x | utils/searx.sh | 7 |
4 files changed, 36 insertions, 1 deletions
diff --git a/docs/admin/update-searxng.rst b/docs/admin/update-searxng.rst index 15735b0ba..c2a34aeee 100644 --- a/docs/admin/update-searxng.rst +++ b/docs/admin/update-searxng.rst @@ -94,6 +94,20 @@ searx from or try:: If you are migrate from searx take into account that the ``.config.sh`` is no longer used. +If you upgrade from searx or from before :pull:`1332` has been merged and you +have filtron and/or morty installed, don't forget to remove HTTP sites. + +Apache:: + + $ sudo -H ./utils/filtron.sh apache remove + $ sudo -H ./utils/morty.sh apache remove + +nginx:: + + $ sudo -H ./utils/filtron.sh nginx remove + $ sudo -H ./utils/morty.sh nginx remove + + Check after Installation ------------------------ diff --git a/utils/filtron.sh b/utils/filtron.sh index ab207bbd8..7607bf6aa 100755 --- a/utils/filtron.sh +++ b/utils/filtron.sh @@ -4,11 +4,15 @@ # shellcheck source=utils/lib.sh source "$(dirname "${BASH_SOURCE[0]}")/lib.sh" +# shellcheck source=utils/brand.env +source "${REPO_ROOT}/utils/brand.env" # ---------------------------------------------------------------------------- # config # ---------------------------------------------------------------------------- +PUBLIC_URL="${PUBLIC_URL:-${SEARXNG_URL}}" + FILTRON_ETC="/etc/filtron" SERVICE_NAME="filtron" @@ -25,13 +29,16 @@ usage() { # shellcheck disable=SC1117 cat <<EOF usage:: - $(basename "$0") remove all] + $(basename "$0") remove all $(basename "$0") apache remove $(basename "$0") nginx remove remove all : drop all components of the filtron service apache remove : drop apache site ${APACHE_FILTRON_SITE} nginx remove : drop nginx site ${NGINX_FILTRON_SITE} + +environment: + PUBLIC_URL : ${PUBLIC_URL} EOF [[ -n ${1} ]] && err_msg "$1" diff --git a/utils/morty.sh b/utils/morty.sh index a85b04bb8..33c5c0e73 100755 --- a/utils/morty.sh +++ b/utils/morty.sh @@ -3,11 +3,15 @@ # shellcheck source=utils/lib.sh source "$(dirname "${BASH_SOURCE[0]}")/lib.sh" +# shellcheck source=utils/brand.env +source "${REPO_ROOT}/utils/brand.env" # ---------------------------------------------------------------------------- # config # ---------------------------------------------------------------------------- +PUBLIC_URL="${PUBLIC_URL:-${SEARXNG_URL}}" + MORTY_LISTEN="${MORTY_LISTEN:-127.0.0.1:3000}" PUBLIC_URL_PATH_MORTY="${PUBLIC_URL_PATH_MORTY:-/morty/}" PUBLIC_URL_MORTY="${PUBLIC_URL_MORTY:-$(echo "$PUBLIC_URL" | sed -e's,^\(.*://[^/]*\).*,\1,g')${PUBLIC_URL_PATH_MORTY}}" @@ -35,6 +39,9 @@ usage:: remove all : drop all components of the morty service apache remove : drop apache site ${APACHE_MORTY_SITE} nginx remove : drop nginx site ${NGINX_MORTY_SITE} + +environment: + PUBLIC_URL_MORTY : ${PUBLIC_URL_MORTY} EOF [[ -n ${1} ]] && err_msg "$1" diff --git a/utils/searx.sh b/utils/searx.sh index 2f5e98c8e..5473c11c4 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -4,11 +4,15 @@ # shellcheck source=utils/lib.sh source "$(dirname "${BASH_SOURCE[0]}")/lib.sh" +# shellcheck source=utils/brand.env +source "${REPO_ROOT}/utils/brand.env" # ---------------------------------------------------------------------------- # config # ---------------------------------------------------------------------------- +PUBLIC_URL="${PUBLIC_URL:-${SEARXNG_URL}}" + SERVICE_NAME="searx" SERVICE_USER="${SERVICE_USER:-${SERVICE_NAME}}" SEARXNG_SETTINGS_PATH="/etc/searx/settings.yml" @@ -24,6 +28,9 @@ usage:: $(basename "$0") remove all remove all: complete uninstall of SearXNG service + +environment: + PUBLIC_URL : ${PUBLIC_URL} EOF [[ -n ${1} ]] && err_msg "$1" |