aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2016-09-06 22:37:03 +0200
committerStephen Finucane <stephenfinucane@hotmail.com>2016-09-07 21:03:37 +0100
commitdc7bf1cc3c8c2f9f1f57bb1ea9beb779542b496d (patch)
treec1b5266294416934447818216b8ee62796beb210
parent2fe9983b5df928aff5bd55722fff49424de4b361 (diff)
downloadpatchwork-dc7bf1cc3c8c2f9f1f57bb1ea9beb779542b496d.tar
patchwork-dc7bf1cc3c8c2f9f1f57bb1ea9beb779542b496d.tar.gz
lib: Refresh nginx/uwsgi configuration
As stated in http://uwsgi-docs.readthedocs.io/en/latest/Nginx.html: " Unfortunately nginx is not able to rewrite PATH_INFO accordingly to SCRIPT_NAME. For such reason you need to instruct uWSGI to map specific apps in the so called “mountpoint” and rewrite SCRIPT_NAME and PATH_INFO automatically [...] ancient uWSGI versions used to support the so called “uwsgi_modifier1 30” approach. Do not do it. it is a really ugly hack " Replacing the uwsgi_modifier1 hack by a mount point seems to work. Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
-rw-r--r--lib/nginx/patchwork.conf1
-rw-r--r--lib/uwsgi/patchwork.ini5
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/nginx/patchwork.conf b/lib/nginx/patchwork.conf
index 5479496..1e69d1a 100644
--- a/lib/nginx/patchwork.conf
+++ b/lib/nginx/patchwork.conf
@@ -35,7 +35,6 @@ http {
location / {
include uwsgi_params;
uwsgi_pass unix:/run/uwsgi/patchwork.sock;
- uwsgi_modifier1 30;
}
}
}
diff --git a/lib/uwsgi/patchwork.ini b/lib/uwsgi/patchwork.ini
index fc0f0ed..04a9837 100644
--- a/lib/uwsgi/patchwork.ini
+++ b/lib/uwsgi/patchwork.ini
@@ -6,11 +6,16 @@ project = patchwork
base = /opt
user = www-data
group = www-data
+url = /
chdir = %(base)/%(project)
pythonpath = %(base)/%(project)
module = %(project).wsgi:application
+# rewrite PATH_INFO and SCRIPT_NAME according to mount-points (for nginx)
+manage-script-name = true
+mount = %(url)=%(module)
+
master = true
processes = 5
# increase buffer size to avoid "502 bad gateway error"