From 753dc21eae9b85e78fac8824d0fa2449692e7999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 19 Nov 2019 08:26:49 +0100
Subject: [PATCH] =?UTF-8?q?Configuration=20file=20for=20OpenIdConnect=20in?=
 =?UTF-8?q?tegration=20is=20now=20generated=20on=20=E2=80=A6=20(#5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Configuration file for OpenIdConnect integration is now generated on container startup

* Add a startup dependency to owncloud phoenix

Signed-off-by: Felix Bartels <felix@host-consultants.de>
---
 owncloud/99-oidc.sh           | 21 +++++++++++++++++++++
 owncloud/konnectd.config.php  | 16 ----------------
 owncloud/owncloud-phoenix.yml |  3 ++-
 3 files changed, 23 insertions(+), 17 deletions(-)
 delete mode 100644 owncloud/konnectd.config.php

diff --git a/owncloud/99-oidc.sh b/owncloud/99-oidc.sh
index 0481d2b..6ffd759 100755
--- a/owncloud/99-oidc.sh
+++ b/owncloud/99-oidc.sh
@@ -6,4 +6,25 @@ set -x
 
 occ app:enable openidconnect
 
+TODAY=$(date)
+cat <<EOF >/mnt/data/config/konnectd.config.php
+// Generated on $TODAY
+<?php
+\$CONFIG = [
+	'loglevel' => 0,
+	'debug' => true,
+	'openid-connect' => [
+		'provider-url' => 'https://$OWNCLOUD_DOMAIN',
+		'client-id' => 'ownCloud',
+		'client-secret' => 'ownCloud',
+		'loginButtonName' => 'kopano',
+		'autoRedirectOnLoginPage' => false,
+		'redirect-url' => 'https://$OWNCLOUD_DOMAIN/owncloud/index.php/apps/openidconnect/redirect',
+		'mode' => 'email',
+		'search-attribute' => 'email',
+		'use-token-introspection-endpoint' => false
+	],
+];
+EOF
+
 true
diff --git a/owncloud/konnectd.config.php b/owncloud/konnectd.config.php
deleted file mode 100644
index 13e6f96..0000000
--- a/owncloud/konnectd.config.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$CONFIG = [
-  'loglevel' => 0,
-  'debug' => true,
-  'openid-connect' => [
-      'provider-url' => 'https://kopano.demo:2015',
-      'client-id' => 'ownCloud',
-      'client-secret' => 'ownCloud',
-      'loginButtonName' => 'kopano',
-      'autoRedirectOnLoginPage' => false,
-      'redirect-url' => 'https://kopano.demo:2015/owncloud/index.php/apps/openidconnect/redirect',
-      'mode' => 'email',
-      'search-attribute' => 'email',
-      'use-token-introspection-endpoint' => false
-  ],
-];
diff --git a/owncloud/owncloud-phoenix.yml b/owncloud/owncloud-phoenix.yml
index fb319ae..77937d6 100644
--- a/owncloud/owncloud-phoenix.yml
+++ b/owncloud/owncloud-phoenix.yml
@@ -4,10 +4,11 @@
 version: "3.5"
 services:
   owncloud:
+    depends_on:
+      - kopano_konnect
     volumes:
       - ./owncloud/99-oidc.sh:/etc/owncloud.d/99-oidc.sh
       - ./owncloud/openidconnect/:/mnt/data/apps/openidconnect/
-      - ./owncloud/konnectd.config.php:/mnt/data/config/konnectd.config.php
       - ./owncloud/phoenix/:/mnt/data/apps/phoenix/
       - ./owncloud/config.json:/mnt/data/apps/phoenix/config.json
   web: