From 6cc5d123438d7ab584bb944ad9f3e3b417aa0694 Mon Sep 17 00:00:00 2001
From: Felix Bartels <1257835+fbartels@users.noreply.github.com>
Date: Tue, 10 Mar 2020 15:30:03 +0100
Subject: [PATCH] fix php version in kweb config (#357)

* fix php version in kweb config
* include webapp kweb config only in the webapp container build
* add workaround for https://jira.kopano.io/browse/KW-3398 for oidc
---
 docker-compose.yml |  1 +
 php/kweb.cfg       |  7 -------
 webapp/Dockerfile  |  1 +
 webapp/kweb.cfg    | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 webapp/kweb.cfg

diff --git a/docker-compose.yml b/docker-compose.yml
index b3737de..73261a3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -109,6 +109,7 @@ services:
       - ADDITIONAL_KOPANO_WEBAPP_PLUGINS=${ADDITIONAL_KOPANO_WEBAPP_PLUGINS}
       - KCCONF_WEBAPP_OIDC_CLIENT_ID=webapp
       - KCCONF_WEBAPP_OIDC_ISS=https://${FQDN}
+      - KCCONF_WEBAPP_CLIENT_TIMEOUT=0 # needed to set to 0 to work around an oidc bug KW-3398
       - TZ=${TZ}
     env_file:
       - kopano_webapp.env
diff --git a/php/kweb.cfg b/php/kweb.cfg
index f7d80bd..9a30574 100644
--- a/php/kweb.cfg
+++ b/php/kweb.cfg
@@ -4,11 +4,4 @@
 
 	# healthcheck
 	status 200 /status
-
-	alias /webapp/ /usr/share/kopano-webapp/
-	fastcgi2 /webapp/ /run/php/php7.0-fpm.sock php {
-		without /webapp/
-		root /usr/share/kopano-webapp/
-	}
-	folderish /webapp
 }
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
index b4c0850..b56d568 100644
--- a/webapp/Dockerfile
+++ b/webapp/Dockerfile
@@ -71,6 +71,7 @@ RUN mkdir -p /tmp/webapp/ && \
         ln -s /tmp/webapp/"$(basename "$i")" "$i"; \
     done
 
+COPY kweb.cfg /etc/kweb.cfg
 COPY start.sh /kopano/start.sh
 COPY goss* /goss/
 
diff --git a/webapp/kweb.cfg b/webapp/kweb.cfg
new file mode 100644
index 0000000..04b1016
--- /dev/null
+++ b/webapp/kweb.cfg
@@ -0,0 +1,14 @@
+:9080 {
+	log stdout
+	errors stderr
+
+	# healthcheck
+	status 200 /status
+
+	alias /webapp/ /usr/share/kopano-webapp/
+	fastcgi2 /webapp/ /run/php/php7.3-fpm.sock php {
+		without /webapp/
+		root /usr/share/kopano-webapp/
+	}
+	folderish /webapp
+}