[brand] SearXNG - nginx & apache searxng.conf, uwsgi searxng.conf

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

9 files changed, 42 insertions, 42 deletions

diff --git a/utils/filtron.sh b/utils/filtron.sh
index e4a4d32e..e9fc79c8 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=(
diff --git a/utils/searx.sh b/utils/searx.sh
index 00ee9301..3f50646e 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -29,7 +29,7 @@ GIT_BRANCH="${GIT_BRANCH:-master}"
 SEARX_PYENV="${SERVICE_HOME}/searx-pyenv"
 SEARX_SRC="${SERVICE_HOME}/searx-src"
 SEARXNG_SETTINGS_PATH="/etc/searxng/settings.yml"
-SEARX_UWSGI_APP="searx.ini"
+SEARXNG_UWSGI_APP="searxng.ini"
 # shellcheck disable=SC2034
 SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
 
@@ -125,7 +125,7 @@ APACHE_SEARX_SITE="searx.conf"
 
 # shellcheck disable=SC2034
 CONFIG_FILES=(
-    "${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP}"
+    "${uWSGI_APPS_AVAILABLE}/${SEARXNG_UWSGI_APP}"
 )
 
 # shellcheck disable=SC2034
@@ -367,7 +367,7 @@ pip install -U pyyaml
 pip install -U -e .
 EOF
     install_settings
-    uWSGI_restart "$SEARX_UWSGI_APP"
+    uWSGI_restart "$SEARXNG_UWSGI_APP"
 }
 
 remove_all() {
@@ -729,30 +729,30 @@ EOF
 }
 
 install_searx_uwsgi() {
-    rst_title "Install SearXNG's uWSGI app (searx.ini)" section
+    rst_title "Install SearXNG's uWSGI app (searxng.ini)" section
     echo
     install_uwsgi
-    uWSGI_install_app "$SEARX_UWSGI_APP"
+    uWSGI_install_app "$SEARXNG_UWSGI_APP"
 }
 
 remove_searx_uwsgi() {
-    rst_title "Remove SearXNG's uWSGI app (searx.ini)" section
+    rst_title "Remove SearXNG's uWSGI app (searxng.ini)" section
     echo
-    uWSGI_remove_app "$SEARX_UWSGI_APP"
+    uWSGI_remove_app "$SEARXNG_UWSGI_APP"
 }
 
 activate_service() {
     rst_title "Activate SearXNG (service)" section
     echo
-    uWSGI_enable_app "$SEARX_UWSGI_APP"
-    uWSGI_restart "$SEARX_UWSGI_APP"
+    uWSGI_enable_app "$SEARXNG_UWSGI_APP"
+    uWSGI_restart "$SEARXNG_UWSGI_APP"
 }
 
 deactivate_service() {
     rst_title "De-Activate SearXNG (service)" section
     echo
-    uWSGI_disable_app "$SEARX_UWSGI_APP"
-    uWSGI_restart "$SEARX_UWSGI_APP"
+    uWSGI_disable_app "$SEARXNG_UWSGI_APP"
+    uWSGI_restart "$SEARXNG_UWSGI_APP"
 }
 
 enable_image_proxy() {
@@ -761,7 +761,7 @@ enable_image_proxy() {
 cd ${SEARX_SRC}
 sed -i -e "s/image_proxy: false/image_proxy: true/g" "$SEARXNG_SETTINGS_PATH"
 EOF
-    uWSGI_restart "$SEARX_UWSGI_APP"
+    uWSGI_restart "$SEARXNG_UWSGI_APP"
 }
 
 disable_image_proxy() {
@@ -770,7 +770,7 @@ disable_image_proxy() {
 cd ${SEARX_SRC}
 sed -i -e "s/image_proxy: true/image_proxy: false/g" "$SEARXNG_SETTINGS_PATH"
 EOF
-    uWSGI_restart "$SEARX_UWSGI_APP"
+    uWSGI_restart "$SEARXNG_UWSGI_APP"
 }
 
 enable_debug() {
@@ -780,7 +780,7 @@ enable_debug() {
 cd ${SEARX_SRC}
 sed -i -e "s/debug: false/debug: true/g" "$SEARXNG_SETTINGS_PATH"
 EOF
-    uWSGI_restart "$SEARX_UWSGI_APP"
+    uWSGI_restart "$SEARXNG_UWSGI_APP"
 }
 
 disable_debug() {
@@ -789,7 +789,7 @@ disable_debug() {
 cd ${SEARX_SRC}
 sed -i -e "s/debug: true/debug: false/g" "$SEARXNG_SETTINGS_PATH"
 EOF
-    uWSGI_restart "$SEARX_UWSGI_APP"
+    uWSGI_restart "$SEARXNG_UWSGI_APP"
 }
 
 set_result_proxy() {
@@ -869,14 +869,14 @@ EOF
         err_msg "~$SERVICE_USER: Missing SearXNG software!"
     fi
 
-    if uWSGI_app_enabled "$SEARX_UWSGI_APP"; then
-        info_msg "uWSGI app $SEARX_UWSGI_APP is enabled."
+    if uWSGI_app_enabled "$SEARXNG_UWSGI_APP"; then
+        info_msg "uWSGI app $SEARXNG_UWSGI_APP is enabled."
     else
-        err_msg "uWSGI app $SEARX_UWSGI_APP not enabled!"
+        err_msg "uWSGI app $SEARXNG_UWSGI_APP not enabled!"
     fi
 
-    uWSGI_app_available "$SEARX_UWSGI_APP" \
-        || err_msg "uWSGI app $SEARX_UWSGI_APP not available!"
+    uWSGI_app_available "$SEARXNG_UWSGI_APP" \
+        || err_msg "uWSGI app $SEARXNG_UWSGI_APP not available!"
 
     if in_container; then
         lxc_suite_info
@@ -955,9 +955,9 @@ excessively bot queries."
 
     apache_install_site --variant=uwsgi "${APACHE_SEARX_SITE}"
 
-    rst_title "Install SearXNG's uWSGI app (searx.ini)" section
+    rst_title "Install SearXNG's uWSGI app (searxng.ini)" section
     echo
-    uWSGI_install_app --variant=socket "$SEARX_UWSGI_APP"
+    uWSGI_install_app --variant=socket "$SEARXNG_UWSGI_APP"
 
     if ! service_is_available "${PUBLIC_URL}"; then
         err_msg "Public service at ${PUBLIC_URL} is not available!"
@@ -979,9 +979,9 @@ This removes apache site ${APACHE_SEARX_SITE}."
 
     apache_remove_site "${APACHE_SEARX_SITE}"
 
-    rst_title "Remove SearXNG's uWSGI app (searx.ini)" section
+    rst_title "Remove SearXNG's uWSGI app (searxng.ini)" section
     echo
-    uWSGI_remove_app "$SEARX_UWSGI_APP"
+    uWSGI_remove_app "$SEARXNG_UWSGI_APP"
 }
 
 rst-doc() {
@@ -1025,12 +1025,12 @@ rst-doc() {
    # For uWSGI debian uses the LSB init process, this might be changed
    # one day, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=833067
 
-   create     ${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP}
-   enable:    sudo -H ln -s ${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP} ${uWSGI_APPS_ENABLED}/
-   start:     sudo -H service uwsgi start   ${SEARX_UWSGI_APP%.*}
-   restart:   sudo -H service uwsgi restart ${SEARX_UWSGI_APP%.*}
-   stop:      sudo -H service uwsgi stop    ${SEARX_UWSGI_APP%.*}
-   disable:   sudo -H rm ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+   create     ${uWSGI_APPS_AVAILABLE}/${SEARXNG_UWSGI_APP}
+   enable:    sudo -H ln -s ${uWSGI_APPS_AVAILABLE}/${SEARXNG_UWSGI_APP} ${uWSGI_APPS_ENABLED}/
+   start:     sudo -H service uwsgi start   ${SEARXNG_UWSGI_APP%.*}
+   restart:   sudo -H service uwsgi restart ${SEARXNG_UWSGI_APP%.*}
+   stop:      sudo -H service uwsgi stop    ${SEARXNG_UWSGI_APP%.*}
+   disable:   sudo -H rm ${uWSGI_APPS_ENABLED}/${SEARXNG_UWSGI_APP}
 
 EOF
                 ;;
@@ -1043,12 +1043,12 @@ EOF
    # - http://0pointer.de/blog/projects/instances.html
    # - https://uwsgi-docs.readthedocs.io/en/latest/Systemd.html#one-service-per-app-in-systemd
 
-   create:    ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
-   enable:    sudo -H systemctl enable   uwsgi@${SEARX_UWSGI_APP%.*}
-   start:     sudo -H systemctl start    uwsgi@${SEARX_UWSGI_APP%.*}
-   restart:   sudo -H systemctl restart  uwsgi@${SEARX_UWSGI_APP%.*}
-   stop:      sudo -H systemctl stop     uwsgi@${SEARX_UWSGI_APP%.*}
-   disable:   sudo -H systemctl disable  uwsgi@${SEARX_UWSGI_APP%.*}
+   create:    ${uWSGI_APPS_ENABLED}/${SEARXNG_UWSGI_APP}
+   enable:    sudo -H systemctl enable   uwsgi@${SEARXNG_UWSGI_APP%.*}
+   start:     sudo -H systemctl start    uwsgi@${SEARXNG_UWSGI_APP%.*}
+   restart:   sudo -H systemctl restart  uwsgi@${SEARXNG_UWSGI_APP%.*}
+   stop:      sudo -H systemctl stop     uwsgi@${SEARXNG_UWSGI_APP%.*}
+   disable:   sudo -H systemctl disable  uwsgi@${SEARXNG_UWSGI_APP%.*}
 
 EOF
                 ;;
@@ -1060,9 +1060,9 @@ EOF
    # The unit file starts uWSGI in emperor mode (/etc/uwsgi.ini), see
    # - https://uwsgi-docs.readthedocs.io/en/latest/Emperor.html
 
-   create:    ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
-   restart:   sudo -H touch ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
-   disable:   sudo -H rm ${uWSGI_APPS_ENABLED}/${SEARX_UWSGI_APP}
+   create:    ${uWSGI_APPS_ENABLED}/${SEARXNG_UWSGI_APP}
+   restart:   sudo -H touch ${uWSGI_APPS_ENABLED}/${SEARXNG_UWSGI_APP}
+   disable:   sudo -H rm ${uWSGI_APPS_ENABLED}/${SEARXNG_UWSGI_APP}
 
 EOF
                 ;;
@@ -1072,7 +1072,7 @@ EOF
             echo -e "\n.. START searx uwsgi-appini $DIST_NAME"
             echo ".. code:: bash"
             echo
-            eval "echo \"$(< "${TEMPLATES}/${uWSGI_APPS_AVAILABLE}/${SEARX_UWSGI_APP}")\"" | prefix_stdout "  "
+            eval "echo \"$(< "${TEMPLATES}/${uWSGI_APPS_AVAILABLE}/${SEARXNG_UWSGI_APP}")\"" | prefix_stdout "  "
             echo -e "\n.. END searx uwsgi-appini $DIST_NAME"
 
         )
diff --git a/utils/templates/etc/httpd/sites-available/searx.conf:filtron b/utils/templates/etc/httpd/sites-available/searxng.conf:filtron
index 379d47e2..379d47e2 100644
--- a/utils/templates/etc/httpd/sites-available/searx.conf:filtron
+++ b/utils/templates/etc/httpd/sites-available/searxng.conf:filtron
diff --git a/utils/templates/etc/httpd/sites-available/searx.conf:uwsgi b/utils/templates/etc/httpd/sites-available/searxng.conf:uwsgi
index aabc125a..aabc125a 100644
--- a/utils/templates/etc/httpd/sites-available/searx.conf:uwsgi
+++ b/utils/templates/etc/httpd/sites-available/searxng.conf:uwsgi
diff --git a/utils/templates/etc/nginx/default.apps-available/searx.conf:filtron b/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron
index e25461c4..e25461c4 100644
--- a/utils/templates/etc/nginx/default.apps-available/searx.conf:filtron
+++ b/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron
diff --git a/utils/templates/etc/uwsgi/apps-archlinux/searx.ini b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
index dcb7d1a7..dcb7d1a7 100644
--- a/utils/templates/etc/uwsgi/apps-archlinux/searx.ini
+++ b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
diff --git a/utils/templates/etc/uwsgi/apps-archlinux/searx.ini:socket b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
index 58060007..58060007 100644
--- a/utils/templates/etc/uwsgi/apps-archlinux/searx.ini:socket
+++ b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
diff --git a/utils/templates/etc/uwsgi/apps-available/searx.ini b/utils/templates/etc/uwsgi/apps-available/searxng.ini
index 440c2e97..440c2e97 100644
--- a/utils/templates/etc/uwsgi/apps-available/searx.ini
+++ b/utils/templates/etc/uwsgi/apps-available/searxng.ini
diff --git a/utils/templates/etc/uwsgi/apps-available/searx.ini:socket b/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket
index 08c98cf6..08c98cf6 100644
--- a/utils/templates/etc/uwsgi/apps-available/searx.ini:socket
+++ b/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket