From 5076488c7f46ab96d8d28b7908dafe2d2cd8ea9d Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Fri, 21 Dec 2018 14:12:08 -0800
Subject: [PATCH] searx: Update outdated Apache configuration

- Avoid Satisfy and Allow which are deprecated.

- Make sure the redirection rule applies only to the URL intended.

- Fix issue with Proxy matching of URLs.

Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
---
 .../conf-available/searx-freedombox.conf       | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/data/etc/apache2/conf-available/searx-freedombox.conf b/data/etc/apache2/conf-available/searx-freedombox.conf
index c58656a45..2efe558f6 100644
--- a/data/etc/apache2/conf-available/searx-freedombox.conf
+++ b/data/etc/apache2/conf-available/searx-freedombox.conf
@@ -1,14 +1,5 @@
-# This exclusion rule is to allow Searx to be added as a search engine in Firefox.
-<LocationMatch "^/searx/(opensearch.xml|static/themes/oscar/img/favicon.png)$">
-    Satisfy Any
-    Allow from all
-    AuthType None
-    ProxyPass unix:/run/uwsgi/app/searx/socket|uwsgi://uwsgi-uds-searx/
-</LocationMatch>
-
-
 # Redirect /searx to /searx/
-<Location /searx>
+<Location ~ ^/searx$>
     <IfModule mod_rewrite.c>
         RewriteEngine On
         RewriteCond %{REQUEST_URI} ^/searx$
@@ -26,3 +17,10 @@
 
     ProxyPass unix:/run/uwsgi/app/searx/socket|uwsgi://uwsgi-uds-searx/
 </Location>
+
+
+# This exclusion rule is to allow Searx to be added as a search engine in Firefox.
+<LocationMatch "^/searx/(opensearch.xml|static/themes/oscar/img/favicon.png)$">
+    Require all granted
+    ProxyPassMatch "unix:/run/uwsgi/app/searx/socket|uwsgi://uwsgi-uds-searx/$1"
+</LocationMatch>