Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit ededaab8 authored by Markus Heiser's avatar Markus Heiser Committed by GitHub
Browse files

Merge pull request #1589 from return42/searxng-install-additions 

[mod] fix minor leftovers from PR #1332
parents 645c2a2c bded8750

docs/admin/update-searxng.rst

+14 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,20 @@ searx from or try:: 
   If you are migrate from searx take into account that the ``.config.sh`` is no

   If you are migrate from searx take into account that the ``.config.sh`` is no

   longer used.

   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

Check after Installation

------------------------

------------------------

utils/filtron.sh

+8 −1
Original line number Original line Diff line number Diff line
@@ -4,11 +4,15 @@ 




# shellcheck source=utils/lib.sh

# shellcheck source=utils/lib.sh

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

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

# shellcheck source=utils/brand.env

source "${REPO_ROOT}/utils/brand.env"





# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------

# config

# config

# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------





PUBLIC_URL="${PUBLIC_URL:-${SEARXNG_URL}}"



FILTRON_ETC="/etc/filtron"

FILTRON_ETC="/etc/filtron"





SERVICE_NAME="filtron"

SERVICE_NAME="filtron"
@@ -25,13 +29,16 @@ usage() { 
    # shellcheck disable=SC1117

    # shellcheck disable=SC1117

    cat <<EOF

    cat <<EOF

usage::

usage::

  $(basename "$0") remove all]

  $(basename "$0") remove all

  $(basename "$0") apache remove

  $(basename "$0") apache remove

  $(basename "$0") nginx  remove

  $(basename "$0") nginx  remove





remove all     : drop all components of the filtron service

remove all     : drop all components of the filtron service

apache remove  : drop apache site ${APACHE_FILTRON_SITE}

apache remove  : drop apache site ${APACHE_FILTRON_SITE}

nginx  remove  : drop nginx site ${NGINX_FILTRON_SITE}

nginx  remove  : drop nginx site ${NGINX_FILTRON_SITE}



environment:

  PUBLIC_URL   : ${PUBLIC_URL}

EOF

EOF





    [[ -n ${1} ]] &&  err_msg "$1"

    [[ -n ${1} ]] &&  err_msg "$1"

utils/morty.sh

+7 −0
Original line number Original line Diff line number Diff line
@@ -3,11 +3,15 @@ 




# shellcheck source=utils/lib.sh

# shellcheck source=utils/lib.sh

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

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

# shellcheck source=utils/brand.env

source "${REPO_ROOT}/utils/brand.env"





# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------

# config

# config

# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------





PUBLIC_URL="${PUBLIC_URL:-${SEARXNG_URL}}"



MORTY_LISTEN="${MORTY_LISTEN:-127.0.0.1:3000}"

MORTY_LISTEN="${MORTY_LISTEN:-127.0.0.1:3000}"

PUBLIC_URL_PATH_MORTY="${PUBLIC_URL_PATH_MORTY:-/morty/}"

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}}"

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

remove all     : drop all components of the morty service

apache remove  : drop apache site ${APACHE_MORTY_SITE}

apache remove  : drop apache site ${APACHE_MORTY_SITE}

nginx  remove  : drop nginx site ${NGINX_MORTY_SITE}

nginx  remove  : drop nginx site ${NGINX_MORTY_SITE}



environment:

  PUBLIC_URL_MORTY   : ${PUBLIC_URL_MORTY}

EOF

EOF





    [[ -n ${1} ]] &&  err_msg "$1"

    [[ -n ${1} ]] &&  err_msg "$1"

utils/searx.sh

+7 −0
Original line number Original line Diff line number Diff line
@@ -4,11 +4,15 @@ 




# shellcheck source=utils/lib.sh

# shellcheck source=utils/lib.sh

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

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

# shellcheck source=utils/brand.env

source "${REPO_ROOT}/utils/brand.env"





# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------

# config

# config

# ----------------------------------------------------------------------------

# ----------------------------------------------------------------------------





PUBLIC_URL="${PUBLIC_URL:-${SEARXNG_URL}}"



SERVICE_NAME="searx"

SERVICE_NAME="searx"

SERVICE_USER="${SERVICE_USER:-${SERVICE_NAME}}"

SERVICE_USER="${SERVICE_USER:-${SERVICE_NAME}}"

SEARXNG_SETTINGS_PATH="/etc/searx/settings.yml"

SEARXNG_SETTINGS_PATH="/etc/searx/settings.yml"
@@ -24,6 +28,9 @@ usage:: 
  $(basename "$0") remove     all

  $(basename "$0") remove     all





remove all:    complete uninstall of SearXNG service

remove all:    complete uninstall of SearXNG service



environment:

  PUBLIC_URL   : ${PUBLIC_URL}

EOF

EOF





    [[ -n ${1} ]] &&  err_msg "$1"

    [[ -n ${1} ]] &&  err_msg "$1"