From 9c56154cfe121c6b89f48dd6b9af4e5e029d8a6e Mon Sep 17 00:00:00 2001
From: Noemi Vanyi <sitbackandwait@gmail.com>
Date: Thu, 21 Apr 2016 13:15:04 +0200
Subject: [PATCH 1/3] add dev tips to quickstart

---
 docs/dev/contribution_guide.rst |  2 ++
 docs/dev/quickstart.rst         | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/docs/dev/contribution_guide.rst b/docs/dev/contribution_guide.rst
index 73f4ea332..65e587294 100644
--- a/docs/dev/contribution_guide.rst
+++ b/docs/dev/contribution_guide.rst
@@ -64,6 +64,8 @@ In order to submit a patch, please follow the steps below:
 
 - Create a pull request.
 
+For more help on getting started with searx development, see :ref:`devquickstart`.
+
 
 Translation
 ~~~~~~~~~~~
diff --git a/docs/dev/quickstart.rst b/docs/dev/quickstart.rst
index edca8af5e..92ef62385 100644
--- a/docs/dev/quickstart.rst
+++ b/docs/dev/quickstart.rst
@@ -1,3 +1,5 @@
+.. _devquickstart:
+
 Development Quickstart
 ----------------------
 
@@ -88,3 +90,19 @@ After installing grunt, the files can be built using the following command:
 .. code:: sh
 
     ./manage.sh build_grunt
+
+
+
+Tips for debugging/development
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1. Turn on debug logging
+    Whether you are working on a new engine or trying to eliminate a bug, it is always a good idea
+    to turn on debug logging. When debug logging is enabled a stack trace appears,
+    instead of the cryptic ``Internal Server Error`` message. It can be turned on by setting
+    ``debug: False`` to ``debug: True`` in settings.yml.
+
+2. Run ``./manage.sh tests`` before creating a PR.
+    Failing build on Travis is common because of PEP8 checks. So a new commit must be created
+    containing these format fixes. This phase can be skipped if ``./manage.sh tests`` is run
+    locally before creating a PR.

From 2430baa1fd6e4ecba4bc72a8e71c49a38b424216 Mon Sep 17 00:00:00 2001
From: Noemi Vanyi <sitbackandwait@gmail.com>
Date: Thu, 21 Apr 2016 13:16:18 +0200
Subject: [PATCH 2/3] update install docs on reverse proxy

---
 docs/dev/install/installation.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/dev/install/installation.rst b/docs/dev/install/installation.rst
index e15ff8b25..d69f30e8f 100644
--- a/docs/dev/install/installation.rst
+++ b/docs/dev/install/installation.rst
@@ -171,6 +171,8 @@ Add this configuration in the server config file
     location = /searx { rewrite ^ /searx/; }
     location /searx {
             try_files $uri @searx;
+            proxy_pass http://localhost:9999/;
+            proxy_set_header X-Script-Name /searx;
     }
     location @searx {
             uwsgi_param SCRIPT_NAME /searx;
@@ -179,6 +181,7 @@ Add this configuration in the server config file
             uwsgi_pass unix:/run/uwsgi/app/searx/socket;
     }
 
+
 Enable base\_url in searx/settings.yml
 
 ::

From b40d7a2b36014f8db825c06350ed84db7eed67d5 Mon Sep 17 00:00:00 2001
From: Noemi Vanyi <sitbackandwait@gmail.com>
Date: Thu, 21 Apr 2016 14:30:17 +0200
Subject: [PATCH 3/3] add reverse proxy configuration

---
 docs/dev/install/installation.rst | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/dev/install/installation.rst b/docs/dev/install/installation.rst
index d69f30e8f..cbbd25f57 100644
--- a/docs/dev/install/installation.rst
+++ b/docs/dev/install/installation.rst
@@ -171,8 +171,6 @@ Add this configuration in the server config file
     location = /searx { rewrite ^ /searx/; }
     location /searx {
             try_files $uri @searx;
-            proxy_pass http://localhost:9999/;
-            proxy_set_header X-Script-Name /searx;
     }
     location @searx {
             uwsgi_param SCRIPT_NAME /searx;
@@ -182,6 +180,23 @@ Add this configuration in the server config file
     }
 
 
+OR
+
+using reverse proxy
+(Please, note that reverse proxy advised to be used in case of single-user or low-traffic instances.)
+
+.. code:: nginx
+
+    location /searx {
+        proxy_pass http://127.0.0.1:8888;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Scheme $scheme;
+        proxy_set_header X-Script-Name /searx;
+        proxy_buffering off;
+    }
+
+
 Enable base\_url in searx/settings.yml
 
 ::