From a9fc4885f2d4ab3fba8fd9fbaa0386090250bd11 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Mon, 11 Oct 2021 19:59:34 +0200
Subject: [brand] SearXNG - bash env SEARXNG_URL

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/filtron.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'utils/filtron.sh')

diff --git a/utils/filtron.sh b/utils/filtron.sh
index eb34b2413..e4a4d32e8 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -560,7 +560,7 @@ This installs a reverse proxy (ProxyPass) into nginx site (${NGINX_FILTRON_SITE}
     # shellcheck disable=SC2034
     SEARX_SRC=$("${REPO_ROOT}/utils/searx.sh" --getenv SEARX_SRC)
     # shellcheck disable=SC2034
-    SEARX_URL_PATH=$("${REPO_ROOT}/utils/searx.sh" --getenv SEARX_URL_PATH)
+    SEARXNG_URL_PATH=$("${REPO_ROOT}/utils/searx.sh" --getenv SEARXNG_URL_PATH)
     nginx_install_app --variant=filtron "${NGINX_FILTRON_SITE}"
 
     info_msg "testing public url .."
-- 
cgit v1.2.3


From 2b1252148d083eb47382733980ec069ef20dcfb6 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Mon, 11 Oct 2021 21:20:22 +0200
Subject: [brand] SearXNG - nginx & apache searxng.conf, uwsgi searxng.conf

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/filtron.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'utils/filtron.sh')

diff --git a/utils/filtron.sh b/utils/filtron.sh
index e4a4d32e8..e9fc79c87 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -46,8 +46,8 @@ GO_VERSION="go1.17.2"
 GO_PKG_URL="https://golang.org/dl/${GO_VERSION}.linux-amd64.tar.gz"
 GO_TAR=$(basename "$GO_PKG_URL")
 
-APACHE_FILTRON_SITE="searx.conf"
-NGINX_FILTRON_SITE="searx.conf"
+APACHE_FILTRON_SITE="searxng.conf"
+NGINX_FILTRON_SITE="searxng.conf"
 
 # shellcheck disable=SC2034
 CONFIG_FILES=(
-- 
cgit v1.2.3


From 4167bf15dce6c1892b25da411f9004c2703ea19c Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Fri, 29 Oct 2021 20:54:30 +0200
Subject: [mod] utils/searx.sh - apache, nginx & uwsgi check old 'searx'
 installations

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/filtron.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'utils/filtron.sh')

diff --git a/utils/filtron.sh b/utils/filtron.sh
index e9fc79c87..1b33e6277 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -274,6 +274,15 @@ install_check() {
     else
         info_msg "golang $(go_version) is installed (min needed is: $GO_VERSION)"
     fi
+
+    if [ -f "${APACHE_SITES_AVAILABLE}/searx.conf" ]; then
+        warn_msg "old searx.conf apache site exists"
+    fi
+
+    if [ -f "${NGINX_APPS_AVAILABLE}/searx.conf" ]; then
+        warn_msg "old searx.conf nginx site exists"
+    fi
+
 }
 
 go_version(){
-- 
cgit v1.2.3


From db6a4d13e7ebe08a5df4fe6f99b0ef87aac94cc8 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Sat, 30 Oct 2021 16:06:14 +0200
Subject: [mod] searx, filtron & morty scripts: add 'reinstall all' command

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/filtron.sh | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'utils/filtron.sh')

diff --git a/utils/filtron.sh b/utils/filtron.sh
index 1b33e6277..fa661ab8b 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -64,6 +64,7 @@ usage() {
 usage::
   $(basename "$0") shell
   $(basename "$0") install    [all|user|rules]
+  $(basename "$0") reinstall  all
   $(basename "$0") update     [filtron]
   $(basename "$0") remove     [all]
   $(basename "$0") activate   [service]
@@ -77,9 +78,12 @@ shell
   start interactive shell from user ${SERVICE_USER}
 install / remove
   :all:        complete setup of filtron service
-  :check:      check the filtron installation
   :user:       add/remove service user '$SERVICE_USER' ($SERVICE_HOME)
   :rules:      reinstall filtron rules $FILTRON_RULES
+install
+  :check:      check the filtron installation
+reinstall:
+  :all:        runs 'install/remove all'
 update filtron
   Update filtron installation ($SERVICE_HOME)
 activate service
@@ -133,6 +137,16 @@ main() {
                     ;;
                 *) usage "$_usage"; exit 42;;
             esac ;;
+        reinstall)
+            rst_title "re-install $SERVICE_NAME" part
+            sudo_or_exit
+            case $2 in
+                all)
+                    remove_all
+                    install_all
+                    ;;
+                *) usage "$_usage"; exit 42;;
+            esac ;;
         install)
             rst_title "$SERVICE_NAME" part
             sudo_or_exit
@@ -271,6 +285,7 @@ install_check() {
 
     if [[ "${GO_VERSION}" > "$(go_version)" ]]; then
         warn_msg "golang ($(go_version)) needs to be $GO_VERSION at least"
+        warn_msg "you need to reinstall $SERVICE_USER --> $0 reinstall all"
     else
         info_msg "golang $(go_version) is installed (min needed is: $GO_VERSION)"
     fi
-- 
cgit v1.2.3