From 26a53e6649d2082d68a62fb73a37b465d2cbc748 Mon Sep 17 00:00:00 2001
From: Joseph Nuthalapati <njoseph@thoughtworks.com>
Date: Thu, 22 Feb 2018 17:23:37 +0530
Subject: [PATCH] searx: Allow Searx to be added as a search engine to Firefox

Signed-off-by: Joseph Nuthalapati <njoseph@thoughtworks.com>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
---
 actions/searx                                         |  1 +
 data/etc/apache2/conf-available/searx-freedombox.conf | 11 ++++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/actions/searx b/actions/searx
index 770fcc410..b6e41796f 100755
--- a/actions/searx
+++ b/actions/searx
@@ -101,6 +101,7 @@ def subcommand_setup(_):
     _generate_secret_key(settings)
     _set_title(settings)
     _set_timeout(settings)
+    write_settings(settings)
 
     action_utils.service_restart('uwsgi')
 
diff --git a/data/etc/apache2/conf-available/searx-freedombox.conf b/data/etc/apache2/conf-available/searx-freedombox.conf
index 24a1b723e..f9cde7c7c 100644
--- a/data/etc/apache2/conf-available/searx-freedombox.conf
+++ b/data/etc/apache2/conf-available/searx-freedombox.conf
@@ -1,3 +1,13 @@
+# This exclusion rule is to allow Searx to be added as a search engine in Firefox.
+<Location ~ "/searx/(opensearch.xml|static/themes/oscar/img/favicon.png)">
+    Satisfy Any
+    Allow from all
+    AuthType None
+    Require all granted
+    ProxyPass unix:/run/uwsgi/app/searx/socket|uwsgi://uwsgi-uds-searx/
+</Location>
+
+
 <Location /searx/>
     Include includes/freedombox-single-sign-on.conf
 
@@ -7,4 +17,3 @@
 
     ProxyPass unix:/run/uwsgi/app/searx/socket|uwsgi://uwsgi-uds-searx/
 </Location>
-