From 5eedd5b72ac2b39bd70b08c179b7bc3b4e6e64a4 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 8 Mar 2022 17:36:49 +0100 Subject: [fix] socket in SearXNG's uWSGI app (searxng.ini) Use SEARX_UWSGI_SOCKET in uWSGI systemd service Signed-off-by: Markus Heiser --- utils/templates/etc/uwsgi/apps-archlinux/searxng.ini | 7 ++++--- utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket | 7 ++++--- utils/templates/etc/uwsgi/apps-available/searxng.ini | 7 ++++--- utils/templates/etc/uwsgi/apps-available/searxng.ini:socket | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) (limited to 'utils/templates') 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 -- cgit v1.2.3 From 8d69ee5e7f5c0115a5db957f2016fee55d4b1ac1 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Tue, 8 Mar 2022 18:13:13 +0100 Subject: [mod] Serving static files with uWSGI (searxng.ini) 1. Serving static files with uWSGI by using static file mount points [1]. 2. Expires set to one year since there are hashes [2] [1] https://uwsgi-docs.readthedocs.io/en/latest/StaticFiles.html#mode-3-using-static-file-mount-points [2] https://github.com/searxng/searxng/pull/932 Signed-off-by: Markus Heiser --- utils/templates/etc/uwsgi/apps-archlinux/searxng.ini | 9 ++++++++- utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket | 12 +++++++++++- utils/templates/etc/uwsgi/apps-available/searxng.ini | 9 ++++++++- utils/templates/etc/uwsgi/apps-available/searxng.ini:socket | 12 +++++++++++- 4 files changed, 38 insertions(+), 4 deletions(-) (limited to 'utils/templates') diff --git a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini index 8fd62b708..aaf55a807 100644 --- a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini +++ b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini @@ -85,5 +85,12 @@ http = ${SEARX_INTERNAL_HTTP} # # socket = ${SEARX_UWSGI_SOCKET} +# uwsgi serves the static files +# expires set to one year since there are hashes +static-map = /static=${SEARX_SRC}/searx/static +static-expires = /* 31557600 +static-gzip-all = True +offload-threads = %k + # Cache -cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1 +cache2 = name=searxngcache,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 41ed8c1e8..e8facda86 100644 --- a/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket +++ b/utils/templates/etc/uwsgi/apps-archlinux/searxng.ini:socket @@ -83,4 +83,14 @@ pythonpath = ${SEARX_SRC} # mkdir -p ${SEARX_UWSGI_SOCKET} # chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET} # -socket = ${SEARX_UWSGI_SOCKET} \ No newline at end of file +socket = ${SEARX_UWSGI_SOCKET} + +# uwsgi serves the static files +# expires set to one year since there are hashes +static-map = /static=${SEARX_SRC}/searx/static +static-expires = /* 31557600 +static-gzip-all = True +offload-threads = %k + +# Cache +cache2 = name=searxngcache,items=2000,blocks=2000,blocksize=4096,bitmap=1 diff --git a/utils/templates/etc/uwsgi/apps-available/searxng.ini b/utils/templates/etc/uwsgi/apps-available/searxng.ini index 618a01cea..9dad84c16 100644 --- a/utils/templates/etc/uwsgi/apps-available/searxng.ini +++ b/utils/templates/etc/uwsgi/apps-available/searxng.ini @@ -84,5 +84,12 @@ http = ${SEARX_INTERNAL_HTTP} # # socket = ${SEARX_UWSGI_SOCKET} +# uwsgi serves the static files +# expires set to one year since there are hashes +static-map = /static=${SEARX_SRC}/searx/static +static-expires = /* 31557600 +static-gzip-all = True +offload-threads = %k + # Cache -cache2 = name=searxcache,items=2000,blocks=2000,blocksize=4096,bitmap=1 +cache2 = name=searxngcache,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 d247ec5af..c76d084e1 100644 --- a/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket +++ b/utils/templates/etc/uwsgi/apps-available/searxng.ini:socket @@ -82,4 +82,14 @@ pythonpath = ${SEARX_SRC} # mkdir -p ${SEARX_UWSGI_SOCKET} # chown -R ${SERVICE_USER}:${SERVICE_GROUP} ${SEARX_UWSGI_SOCKET} # -socket = ${SEARX_UWSGI_SOCKET} \ No newline at end of file +socket = ${SEARX_UWSGI_SOCKET} + +# uwsgi serves the static files +# expires set to one year since there are hashes +static-map = /static=${SEARX_SRC}/searx/static +static-expires = /* 31557600 +static-gzip-all = True +offload-threads = %k + +# Cache +cache2 = name=searxngcache,items=2000,blocks=2000,blocksize=4096,bitmap=1 -- cgit v1.2.3