From 5eedd5b72ac2b39bd70b08c179b7bc3b4e6e64a4 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 8 Mar 2022 17:36:49 +0100
Subject: [PATCH] [fix] socket in SearXNG's uWSGI app (searxng.ini)

Use SEARX_UWSGI_SOCKET in uWSGI systemd service

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/searx.sh                                             | 2 +-
 utils/templates/etc/uwsgi/apps-archlinux/searxng.ini       | 7 ++++---
 .../templates/etc/uwsgi/apps-archlinux/searxng.ini:socket  | 7 ++++---
 utils/templates/etc/uwsgi/apps-available/searxng.ini       | 7 ++++---
 .../templates/etc/uwsgi/apps-available/searxng.ini:socket  | 7 ++++---
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/utils/searx.sh b/utils/searx.sh
index 13ae25a07..5ae9a6ade 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -31,7 +31,7 @@ SEARX_SRC="${SERVICE_HOME}/searx-src"
 SEARXNG_SETTINGS_PATH="/etc/searxng/settings.yml"
 SEARXNG_UWSGI_APP="searxng.ini"
 # shellcheck disable=SC2034
-SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
+SEARX_UWSGI_SOCKET="/run/uwsgi/app/searxng/socket"
 
 # apt packages
 SEARX_PACKAGES_debian="\
diff --git a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
index ceaec19c2..8fd62b708 100644
--- a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
+++ b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini
@@ -1,3 +1,4 @@
+# -*- mode: conf; coding: utf-8  -*-
 [uwsgi]
 
 # uWSGI core
@@ -79,10 +80,10 @@ http = ${SEARX_INTERNAL_HTTP}
 #
 # On some distributions you need to create the app folder for the sockets::
 #
-#   mkdir -p /run/uwsgi/app/searx
-#   chown -R ${SERVICE_USER}:${SERVICE_GROUP}  /run/uwsgi/app/searx
+#   mkdir -p ${SEARX_UWSGI_SOCKET}
+#   chown -R ${SERVICE_USER}:${SERVICE_GROUP}  ${SEARX_UWSGI_SOCKET}
 #
-# socket = /run/uwsgi/app/searx/socket
+# socket = ${SEARX_UWSGI_SOCKET}
 
 # Cache
 cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1
diff --git a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
index fec553165..41ed8c1e8 100644
--- a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
+++ b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket
@@ -1,3 +1,4 @@
+# -*- mode: conf; coding: utf-8  -*-
 [uwsgi]
 
 # uWSGI core
@@ -79,7 +80,7 @@ pythonpath = ${SEARX_SRC}
 #
 # On some distributions you need to create the app folder for the sockets::
 #
-#   mkdir -p /run/uwsgi/app/searx
-#   chown -R ${SERVICE_USER}:${SERVICE_GROUP}  /run/uwsgi/app/searx
+#   mkdir -p ${SEARX_UWSGI_SOCKET}
+#   chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET}
 #
-socket = /run/uwsgi/app/searx/socket
\ No newline at end of file
+socket = ${SEARX_UWSGI_SOCKET}
\ No newline at end of file
diff --git a/utils/templates/etc/uwsgi/apps-available/searxng.ini b/utils/templates/etc/uwsgi/apps-available/searxng.ini
index db11df54f..618a01cea 100644
--- a/utils/templates/etc/uwsgi/apps-available/searxng.ini
+++ b/utils/templates/etc/uwsgi/apps-available/searxng.ini
@@ -1,3 +1,4 @@
+# -*- mode: conf; coding: utf-8  -*-
 [uwsgi]
 
 # uWSGI core
@@ -78,10 +79,10 @@ http = ${SEARX_INTERNAL_HTTP}
 #
 # On some distributions you need to create the app folder for the sockets::
 #
-#   mkdir -p /run/uwsgi/app/searx
-#   chown -R ${SERVICE_USER}:${SERVICE_GROUP}  /run/uwsgi/app/searx
+#   mkdir -p /run/uwsgi/app/searxng
+#   chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET}
 #
-# socket = /run/uwsgi/app/searx/socket
+# socket = ${SEARX_UWSGI_SOCKET}
 
 # Cache
 cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1
diff --git a/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket b/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket
index a9598b52b..d247ec5af 100644
--- a/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket
+++ b/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket
@@ -1,3 +1,4 @@
+# -*- mode: conf; coding: utf-8  -*-
 [uwsgi]
 
 # uWSGI core
@@ -78,7 +79,7 @@ pythonpath = ${SEARX_SRC}
 #
 # On some distributions you need to create the app folder for the sockets::
 #
-#   mkdir -p /run/uwsgi/app/searx
-#   chown -R ${SERVICE_USER}:${SERVICE_GROUP}  /run/uwsgi/app/searx
+#   mkdir -p ${SEARX_UWSGI_SOCKET}
+#   chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET}
 #
-socket = /run/uwsgi/app/searx/socket
\ No newline at end of file
+socket = ${SEARX_UWSGI_SOCKET}
\ No newline at end of file