[DRE-commits] [diaspora-installer] 01/03: update nginx conf for http

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository diaspora-installer.

commit ac480ef8ebf0dc32776f557207e1243ad74afe05
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Apr 28 14:50:57 2017 +0530

    update nginx conf for http
---
 nginx.conf.nohttps.example | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nginx.conf.nohttps.example b/nginx.conf.nohttps.example
index 8ad6ccc..2c4e86d 100644
--- a/nginx.conf.nohttps.example
+++ b/nginx.conf.nohttps.example
@@ -6,6 +6,9 @@ server {
             listen   	80;
             server_name SERVERNAME_FIXME www.SERVERNAME_FIXME;
 
+            proxy_set_header   X-Real-IP  $remote_addr;
+            proxy_set_header   X-FORWARDED-PROTO http;
+
             access_log /var/log/diaspora/access.log;
             error_log /var/log/diaspora/error.log;
 
@@ -30,7 +33,7 @@ server {
                           proxy_set_header X-Real-IP $remote_addr;
                           proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
                           proxy_set_header Host $http_host;
-                          proxy_set_header X-Forwarded-Proto https;
+                          proxy_set_header X-Forwarded-Proto http;
                           proxy_redirect off;
 
                           client_max_body_size 4M;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/diaspora-installer.git