From 487ff1e18617283bda8734f2872f1449d6c32ff9 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lukashirt@mail.com>
Date: Sun, 13 Dec 2020 17:23:40 +0100
Subject: [PATCH] Rename last few occurences

---
 .drone.star                                            |  4 ++--
 accounts/ui/tests/run-acceptance-test.sh               |  4 ++--
 .../config/ocis/identifier-registration.dist.yaml      |  2 +-
 .../examples/cs3_users_ocis/docker-compose.yaml        | 10 +++++-----
 settings/ui/tests/run-acceptance-test.sh               |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.drone.star b/.drone.star
index 47589211c5..76ca44769a 100644
--- a/.drone.star
+++ b/.drone.star
@@ -624,7 +624,7 @@ def uiTestPipeline(ctx, suiteName, webBranch = 'master', webCommit = '', storage
           'RUN_ON_OCIS': 'true',
           'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data',
           'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton',
-          'WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
+          'WEB_UI_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
           'TEST_TAGS': 'not @skipOnOCIS and not @skip',
           'LOCAL_UPLOAD_DIR': '/uploads',
           'NODE_TLS_REJECT_UNAUTHORIZED': 0,
@@ -696,7 +696,7 @@ def accountsUITests(ctx, webBranch, webCommit, storage = 'owncloud', accounts_ha
           'RUN_ON_OCIS': 'true',
           'OCIS_REVA_DATA_ROOT': '/srv/app/tmp/ocis/owncloud/data',
           'OCIS_SKELETON_DIR': '/srv/app/testing/data/webUISkeleton',
-          'WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
+          'WEB_UI_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
           'TEST_TAGS': 'not @skipOnOCIS and not @skip',
           'LOCAL_UPLOAD_DIR': '/uploads',
           'NODE_TLS_REJECT_UNAUTHORIZED': 0,
diff --git a/accounts/ui/tests/run-acceptance-test.sh b/accounts/ui/tests/run-acceptance-test.sh
index 3e7606259b..e60a6cc6db 100755
--- a/accounts/ui/tests/run-acceptance-test.sh
+++ b/accounts/ui/tests/run-acceptance-test.sh
@@ -12,9 +12,9 @@ then
 	exit 1
 fi
 
-if [ -z "$WEB_CONFIG" ]
+if [ -z "$WEB_UI_CONFIG" ]
 then
-	echo "WEB_CONFIG env variable is not set, cannot find web config file"
+	echo "WEB_UI_CONFIG env variable is not set, cannot find web config file"
 	exit 1
 fi
 
diff --git a/deployments/examples/cs3_users_ocis/config/ocis/identifier-registration.dist.yaml b/deployments/examples/cs3_users_ocis/config/ocis/identifier-registration.dist.yaml
index dbcead8c2d..2c425242f7 100644
--- a/deployments/examples/cs3_users_ocis/config/ocis/identifier-registration.dist.yaml
+++ b/deployments/examples/cs3_users_ocis/config/ocis/identifier-registration.dist.yaml
@@ -2,7 +2,7 @@
 
 # OpenID Connect client registry.
 clients:
-  - id: phoenix
+  - id: web
     name: OCIS
     application_type: web
     insecure: yes
diff --git a/deployments/examples/cs3_users_ocis/docker-compose.yaml b/deployments/examples/cs3_users_ocis/docker-compose.yaml
index 97b69f8c51..b3fa4ceefb 100644
--- a/deployments/examples/cs3_users_ocis/docker-compose.yaml
+++ b/deployments/examples/cs3_users_ocis/docker-compose.yaml
@@ -79,11 +79,11 @@ services:
       PROXY_OIDC_INSECURE: "${INSECURE:-false}"
       PROXY_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       PROXY_TLS: "false"
-      # phoenix config
-      PHOENIX_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-ocis.owncloud.test}
-      PHOENIX_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/.well-known/openid-configuration
-      PHOENIX_WEB_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
-      PHOENIX_WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
+      # web config
+      WEB_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-ocis.owncloud.test}
+      WEB_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/.well-known/openid-configuration
+      WEB_UI_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
+      WEB_UI_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       # storage config
       STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data
       STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/
diff --git a/settings/ui/tests/run-acceptance-test.sh b/settings/ui/tests/run-acceptance-test.sh
index 0ae07b9065..939af07707 100755
--- a/settings/ui/tests/run-acceptance-test.sh
+++ b/settings/ui/tests/run-acceptance-test.sh
@@ -12,9 +12,9 @@ then
 	exit 1
 fi
 
-if [ -z "$WEB_CONFIG" ]
+if [ -z "$WEB_UI_CONFIG" ]
 then
-	echo "WEB_CONFIG env variable is not set, cannot find ownCloud Web config file"
+	echo "WEB_UI_CONFIG env variable is not set, cannot find ownCloud Web config file"
 	exit 1
 fi