From 23365556ad67fc820d0193c0be4bfe579cf4afbe Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Thu, 21 Jul 2016 16:29:13 -0600 Subject: [PATCH] Bug 16918: Serve OPAC/intranet homepage via Plack Test plan: 1) Shut down the Plack server. 2) The OPAC and staff side homepage should still load (as it is mistakenly being loaded via CGI). 3) Apply patch. 4) Both homepages should now not load. Signed-off-by: Chris Cormack Signed-off-by: Marcel de Rooy Signed-off-by: Kyle M Hall --- debian/templates/apache-shared-intranet-plack.conf | 1 + debian/templates/apache-shared-opac-plack.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/templates/apache-shared-intranet-plack.conf b/debian/templates/apache-shared-intranet-plack.conf index f77f6403e0..e243f20a98 100644 --- a/debian/templates/apache-shared-intranet-plack.conf +++ b/debian/templates/apache-shared-intranet-plack.conf @@ -24,6 +24,7 @@ # RequestHeader set X-FORWARDED-PROTO "https" # Point the intranet site to Plack + ProxyPass /index.html "unix:/var/run/koha/${instance}/plack.sock|http://localhost/intranet/mainpage.pl" ProxyPass /cgi-bin/koha "unix:/var/run/koha/${instance}/plack.sock|http://localhost/intranet" ProxyPassReverse /cgi-bin/koha "unix:/var/run/koha/${instance}/plack.sock|http://localhost/intranet" diff --git a/debian/templates/apache-shared-opac-plack.conf b/debian/templates/apache-shared-opac-plack.conf index f68e3d28f1..0abb2c34c8 100644 --- a/debian/templates/apache-shared-opac-plack.conf +++ b/debian/templates/apache-shared-opac-plack.conf @@ -14,6 +14,7 @@ # RequestHeader set X-FORWARDED-PROTO "https" # Point the intranet site to Plack + ProxyPass /index.html "unix:/var/run/koha/${instance}/plack.sock|http://localhost/opac/opac-main.pl" ProxyPass /cgi-bin/koha "unix:/var/run/koha/${instance}/plack.sock|http://localhost/opac" ProxyPassReverse /cgi-bin/koha "unix:/var/run/koha/${instance}/plack.sock|http://localhost/opac" -- 2.39.5