From 81bba4486916dbca4467a7e8c8b839a7c55c2a09 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 27 May 2022 18:41:08 +0200 Subject: [install scripts] rename SEARX_ variables to SEARXNG_ Signed-off-by: Markus Heiser --- utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/templates/etc/nginx/default.apps-available') diff --git a/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron b/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron index e25461c47..631f2b265 100644 --- a/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron +++ b/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron @@ -12,5 +12,5 @@ location ${SEARXNG_URL_PATH} { } location ${SEARXNG_URL_PATH}/static/ { - alias ${SEARX_SRC}/searx/static/; + alias ${SEARXNG_STATIC}/; } -- cgit v1.2.3 From 782f73540e2d383ea122716507ccd9582918ab51 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Fri, 27 May 2022 18:43:14 +0200 Subject: [utils/searxng.sh] implement new script to install SearXNG Signed-off-by: Markus Heiser --- .../etc/nginx/default.apps-available/searxng.conf | 29 ++++++++++++++++++++++ .../default.apps-available/searxng.conf:socket | 26 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 utils/templates/etc/nginx/default.apps-available/searxng.conf create mode 100644 utils/templates/etc/nginx/default.apps-available/searxng.conf:socket (limited to 'utils/templates/etc/nginx/default.apps-available') diff --git a/utils/templates/etc/nginx/default.apps-available/searxng.conf b/utils/templates/etc/nginx/default.apps-available/searxng.conf new file mode 100644 index 000000000..7225a8f96 --- /dev/null +++ b/utils/templates/etc/nginx/default.apps-available/searxng.conf @@ -0,0 +1,29 @@ +location ${SEARXNG_URL_PATH} { + + proxy_pass http://${SEARXNG_INTERNAL_HTTP}; + + proxy_set_header Host \$host; + proxy_set_header Connection \$http_connection; + + # see flaskfix.py + proxy_set_header X-Scheme \$scheme; + proxy_set_header X-Script-Name ${SEARXNG_URL_PATH}; + + # see limiter.py + proxy_set_header X-Real-IP \$remote_addr; + proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; + + # proxy_buffering off; + # proxy_request_buffering off; + # proxy_buffer_size 8k; + +} + +# uWSGI serves the static files and in settings.yml we use:: +# +# ui: +# static_use_hash: true +# +# location ${SEARXNG_URL_PATH}/static/ { +# alias ${SEARXNG_STATIC}/; +# } diff --git a/utils/templates/etc/nginx/default.apps-available/searxng.conf:socket b/utils/templates/etc/nginx/default.apps-available/searxng.conf:socket new file mode 100644 index 000000000..7a74eab48 --- /dev/null +++ b/utils/templates/etc/nginx/default.apps-available/searxng.conf:socket @@ -0,0 +1,26 @@ +location ${SEARXNG_URL_PATH} { + + uwsgi_pass unix://${SEARXNG_UWSGI_SOCKET}; + + include uwsgi_params; + + uwsgi_param HTTP_HOST \$host; + uwsgi_param HTTP_CONNECTION \$http_connection; + + # see flaskfix.py + uwsgi_param HTTP_X_SCHEME \$scheme; + uwsgi_param HTTP_X_SCRIPT_NAME ${SEARXNG_URL_PATH}; + + # see limiter.py + uwsgi_param HTTP_X_REAL_IP \$remote_addr; + uwsgi_param HTTP_X_FORWARDED_FOR \$proxy_add_x_forwarded_for; +} + +# uWSGI serves the static files and in settings.yml we use:: +# +# ui: +# static_use_hash: true +# +# location ${SEARXNG_URL_PATH}/static/ { +# alias ${SEARXNG_STATIC}/; +# } -- cgit v1.2.3 From 692708aa771c1f4927a3037ecc5aa9c06f1a2494 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Thu, 16 Jun 2022 16:30:18 +0200 Subject: [clean up] drop obsolete searx, filtron and morty install scripts Since ./utils/searxng.sh is implemented, the old installation procedures from filtron, morty and searx can be removed. For users who want to upgrade, the procedures for removing old installations have still been retained. Signed-off-by: Markus Heiser --- .../etc/nginx/default.apps-available/morty.conf | 11 ----------- .../nginx/default.apps-available/searxng.conf:filtron | 16 ---------------- 2 files changed, 27 deletions(-) delete mode 100644 utils/templates/etc/nginx/default.apps-available/morty.conf delete mode 100644 utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron (limited to 'utils/templates/etc/nginx/default.apps-available') diff --git a/utils/templates/etc/nginx/default.apps-available/morty.conf b/utils/templates/etc/nginx/default.apps-available/morty.conf deleted file mode 100644 index 51f083985..000000000 --- a/utils/templates/etc/nginx/default.apps-available/morty.conf +++ /dev/null @@ -1,11 +0,0 @@ -# https://example.org/morty - -location /morty { - proxy_pass http://127.0.0.1:3000/; - - proxy_set_header Host \$host; - proxy_set_header Connection \$http_connection; - proxy_set_header X-Real-IP \$remote_addr; - proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; - proxy_set_header X-Scheme \$scheme; -} diff --git a/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron b/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron deleted file mode 100644 index 631f2b265..000000000 --- a/utils/templates/etc/nginx/default.apps-available/searxng.conf:filtron +++ /dev/null @@ -1,16 +0,0 @@ -# https://example.org/searx - -location ${SEARXNG_URL_PATH} { - proxy_pass http://127.0.0.1:4004/; - - proxy_set_header Host \$host; - proxy_set_header Connection \$http_connection; - proxy_set_header X-Real-IP \$remote_addr; - proxy_set_header X-Forwarded-For \$proxy_add_x_forwarded_for; - proxy_set_header X-Scheme \$scheme; - proxy_set_header X-Script-Name ${SEARXNG_URL_PATH}; -} - -location ${SEARXNG_URL_PATH}/static/ { - alias ${SEARXNG_STATIC}/; -} -- cgit v1.2.3