summaryrefslogtreecommitdiff
path: root/utils/searx.sh
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2020-01-20 19:08:56 +0100
committerMarkus Heiser <markus.heiser@darmarit.de>2020-01-20 19:08:56 +0100
commitaf2f58fc5847756d20741bb4c782f07943b0af60 (patch)
tree1c7e52b02d865fa330a85c98d780e44205654cc9 /utils/searx.sh
parent9b5a7f7559faf121e44ba3e7260290bd7efe74bf (diff)
utils/filtron.sh: add script to install filtron middleware (apache)
Preparation for the installation of an apache site. Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'utils/searx.sh')
-rwxr-xr-xutils/searx.sh22
1 files changed, 17 insertions, 5 deletions
diff --git a/utils/searx.sh b/utils/searx.sh
index c9adecc8c..a1b1140ed 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -15,7 +15,6 @@ SERVICE_USER="${SERVICE_NAME}"
SERVICE_GROUP="${SERVICE_USER}"
SERVICE_HOME="/home/${SERVICE_USER}"
-# shellcheck disable=SC2034
SEARX_URL="127.0.0.1:8888"
SEARX_GIT_URL="https://github.com/asciimoo/searx.git"
@@ -34,6 +33,8 @@ SEARX_SETTINGS="${SEARX_SRC}/searx/settings.yml"
SEARX_INSTANCE_NAME="${SEARX_INSTANCE_NAME:-searx@$(uname -n)}"
SEARX_UWSGI_APP="searx.ini"
+APACHE_SITE="searx.conf"
+
# shellcheck disable=SC2034
CONFIG_FILES=(
"${uWSGI_SETUP}/apps-available/${SEARX_UWSGI_APP}"
@@ -175,9 +176,12 @@ install_all() {
err_msg "URL http://$SEARX_URL not available, check searx & uwsgi setup!"
fi
wait_key
+ if apache_is_installed; then
+ install_apache_site
+ wait_key
+ fi
# ToDo ...
- # install_apache_site
# test_public_searx
# info_msg "searX --> https://${SEARX_APACHE_DOMAIN}${SEARX_APACHE_URL}"
@@ -428,11 +432,12 @@ EOF
uWSGI_restart
}
-
show_service() {
rst_title "service status & log"
echo
+ apache_is_installed && info_msg "Apache is installed."
+
if user_is_available; then
info_msg "service account $SERVICE_USER available."
else
@@ -468,9 +473,9 @@ show_service() {
enable_debug
_debug_on=1
fi
- wait_key
echo
- systemctl status uwsgi.service
+ systemctl --no-pager -l status uwsgi.service
+ echo
read -r -s -n1 -t 2 -p "// use CTRL-C to stop monitoring the log"
echo
while true; do
@@ -485,6 +490,13 @@ show_service() {
return 0
}
+install_apache_site() {
+ rst_title "Install Apache site $APACHE_SITE" section
+ echo
+ err_msg "not yet implemented (${APACHE_SITE})"; return 42
+ # apache_install_site "${APACHE_SITE}"
+}
+
# ----------------------------------------------------------------------------
main "$@"
# ----------------------------------------------------------------------------