From 713c0bb3d2350f5fb0072364ba6e9351f11ef0f9 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Tue, 9 Nov 2021 16:10:11 +0100
Subject: [PATCH] fix oc10 ocis parallel deployment

---
 .../config/ocis/entrypoint-override.sh                | 11 -----------
 .../ocis/{proxy-config.dist.json => proxy.json}       |  7 ++++---
 .../examples/oc10_ocis_parallel/docker-compose.yml    |  3 +--
 3 files changed, 5 insertions(+), 16 deletions(-)
 rename deployments/examples/oc10_ocis_parallel/config/ocis/{proxy-config.dist.json => proxy.json} (95%)

diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/entrypoint-override.sh b/deployments/examples/oc10_ocis_parallel/config/ocis/entrypoint-override.sh
index 547ece014..cd72bb548 100755
--- a/deployments/examples/oc10_ocis_parallel/config/ocis/entrypoint-override.sh
+++ b/deployments/examples/oc10_ocis_parallel/config/ocis/entrypoint-override.sh
@@ -1,11 +1,5 @@
 #!/bin/sh
 set -e
-
-mkdir -p /var/tmp/ocis/.config/
-cp /config/proxy-config.dist.json /var/tmp/ocis/.config/proxy-config.json
-# TODO: remove replace logic when log level configuration is fixed
-sed -i 's/PROXY_LOG_LEVEL/${PROXY_LOG_LEVEL}/g' /var/tmp/ocis/.config/proxy-config.json
-
 ocis server &
 sleep 10
 
@@ -14,9 +8,4 @@ ocis kill idp
 ocis kill glauth
 ocis kill accounts
 
-# workaround for loading proxy configuration
-ocis kill proxy
-sleep 10
-ocis proxy server &
-
 wait
diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy-config.dist.json b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json
similarity index 95%
rename from deployments/examples/oc10_ocis_parallel/config/ocis/proxy-config.dist.json
rename to deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json
index 23269f432..993327d62 100644
--- a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy-config.dist.json
+++ b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json
@@ -1,7 +1,4 @@
 {
-  "log": {
-    "level": "PROXY_LOG_LEVEL"
-  },
   "policy_selector": {
     "claims": {
       "default_policy": "oc10",
@@ -54,6 +51,10 @@
           "endpoint": "/index.php/",
           "backend": "http://localhost:9140"
         },
+        {
+          "endpoint": "/app/",
+          "backend": "http://localhost:9140"
+        },
         {
           "endpoint": "/data",
           "backend": "http://localhost:9140"
diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
index cd02bd92b..c49892791 100644
--- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml
+++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
@@ -108,7 +108,6 @@ services:
       OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303
       # General oCIS config
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
-      PROXY_LOG_LEVEL: ${PROXY_LOG_LEVEL:-error}
       OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test}
       PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates
       PROXY_TLS: "false" # do not use SSL between Traefik and oCIS
@@ -119,7 +118,7 @@ services:
       OCIS_MACHINE_AUTH_API_KEY: ${OCIS_MACHINE_AUTH_API_KEY:-change-me-please}
     volumes:
       - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh
-      - ./config/ocis/proxy-config.dist.json:/config/proxy-config.dist.json
+      - ./config/ocis/proxy.json:/etc/ocis/proxy.json
       - ocis-data:/var/lib/ocis
       # shared volume with oC10
       - oc10-data:/mnt/data