Bug 21267: Set X-FORWARDED-PROTO https if required

This patch makes the apache configuration for the reverse proxy
(required for Plack) so it sets the X-FORWARDED-PROTO header correctly
for Plack::Middleware::ReverseProxy to use it.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Since we actually resolve 19799 now (Changing language on OPAC redirects
back to homepage), I will move that code to a new enh report.

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/debian/templates/apache-shared-intranet-plack.conf b/debian/templates/apache-shared-intranet-plack.conf
index 5ae8e07..ff8cd9c 100644 (file)
--- a/debian/templates/apache-shared-intranet-plack.conf
+++ b/debian/templates/apache-shared-intranet-plack.conf
@@ -22,7 +22,7 @@
 
         ProxyPreserveHost On
 
-       # RequestHeader set X-FORWARDED-PROTO "https"
+        RequestHeader set X-FORWARDED-PROTO "https" env=HTTPS
 
         # Point the intranet site to Plack
         ProxyPass /index.html "unix:/var/run/koha/${instance}/plack.sock|http://localhost/intranet/mainpage.pl"

diff --git a/debian/templates/apache-shared-opac-plack.conf b/debian/templates/apache-shared-opac-plack.conf
index 3ea6acd..bee75e9 100644 (file)
--- a/debian/templates/apache-shared-opac-plack.conf
+++ b/debian/templates/apache-shared-opac-plack.conf
@@ -11,7 +11,7 @@
 
         ProxyPreserveHost On
 
-       # RequestHeader set X-FORWARDED-PROTO "https"
+        RequestHeader set X-FORWARDED-PROTO "https" env=HTTPS
 
         # Point the OPAC site to Plack
         ProxyPass /index.html "unix:/var/run/koha/${instance}/plack.sock|http://localhost/opac/opac-main.pl"