mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-04 19:19:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename last few occurences

Browse Source
This commit is contained in:
Lukas Hirt
2020-12-13 17:23:40 +01:00
parent 2f3e473e69
commit 487ff1e186
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.star
View File

@@ -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,

4
accounts/ui/tests/run-acceptance-test.sh
View File

@@ -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

2
deployments/examples/cs3_users_ocis/config/ocis/identifier-registration.dist.yaml
View File

@@ -2,7 +2,7 @@
# OpenID Connect client registry.
clients:
- id: phoenix
- id: web
name: OCIS
application_type: web
insecure: yes

10
deployments/examples/cs3_users_ocis/docker-compose.yaml
View File

@@ -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}/

4
settings/ui/tests/run-acceptance-test.sh
View File

@@ -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