mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-12 14:30:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add UI to flagset

Browse Source
This commit is contained in:
Lukas Hirt
2020-12-09 14:12:51 +01:00
parent 51421d7161
commit 14f0bd9cc5
9 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.star
+1 -1
View File
@@ -1534,7 +1534,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4):
'STORAGE_FRONTEND_PUBLIC_URL': 'https://ocis-server:9200',
'STORAGE_SHARING_USER_JSON_FILE': '/srv/app/tmp/ocis/shares.json',
'PROXY_ENABLE_BASIC_AUTH': True,
'WEB_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
'WEB_UI_CONFIG': '/drone/src/tests/config/drone/ocis-config.json',
'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/tests/config/drone/identifier-registration.yml',
'KONNECTD_ISS': 'https://ocis-server:9200',
'KONNECTD_TLS': 'true',
deployments/examples/ocis_keycloak/docker-compose.yml
+2 -2
View File
@@ -57,8 +57,8 @@ services:
WEB_OIDC_AUTHORITY: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}
WEB_OIDC_CLIENT_ID: ${OCIS_OIDC_CLIENT_ID:-web}
WEB_OIDC_METADATA_URL: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}/.well-known/openid-configuration
WEB_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
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}/
deployments/examples/ocis_traefik/docker-compose.yml
+2 -2
View File
@@ -61,8 +61,8 @@ services:
# 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_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
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}/
deployments/examples/owncloud10_with_oc_web/docker-compose.yml
+1 -1
View File
@@ -97,7 +97,7 @@ services:
# graph
GRAPH_OIDC_ENDPOINT: https://${OC10_DOMAIN:-oc10.owncloud.test}/apps/graphapi/v1.0
# web ui
WEB_CONFIG: "/config/config.json"
WEB_UI_CONFIG: "/config/config.json"
# storage - although not used, yet
STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
STORAGE_OIDC_INSECURE: "${INSECURE:-false}"
docs/ocis/deployment/basic-remote-setup.md
+1 -1
View File
@@ -61,7 +61,7 @@ PROXY_HTTP_ADDR=0.0.0.0:9200 \
KONNECTD_ISS=https://your-server:9200 \
REVA_OIDC_ISSUER=https://your-server:9200 \
WEB_OIDC_AUTHORITY=https://your-server:9200 \
WEB_CONFIG_SERVER=https://your-server:9200 \
WEB_UI_CONFIG_SERVER=https://your-server:9200 \
WEB_OIDC_METADATA_URL=https://your-server:9200/.well-known/openid-configuration \
REVA_DATAGATEWAY_URL=https://your-server:9200/data \
REVA_FRONTEND_URL=https://your-server:9200 \
docs/ocis/development/extensions.md
+1 -1
View File
@@ -128,7 +128,7 @@ This is what hello is: copy and extend!
1. ownCloud Web is configured using the config.json which is served by the ocis-web service (either `bin/ocis web` or `bin/ocis-web server`)
2. point ocis-web to the web config which you extended with an external app:
`WEB_CONFIG="`pwd`/../web/config.json" ASSET_PATH="`pwd`/../web/dist" bin/ocis web`
`WEB_UI_CONFIG="`pwd`/../web/config.json" ASSET_PATH="`pwd`/../web/dist" bin/ocis web`
```json
{
ocis/docker-compose-eos-test.yml
+1 -1
View File
@@ -35,7 +35,7 @@ services:
KONNECTD_ISS: https://${OCIS_DOMAIN:-localhost}:9200
WEB_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-localhost}:9200
WEB_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-localhost}:9200/.well-known/openid-configuration
WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-localhost}:9200
WEB_UI_CONFIG_SERVER: https://${OCIS_DOMAIN:-localhost}:9200
STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200
# make home and users storages use eos
ocis/docker-compose.yml
+1 -1
View File
@@ -43,7 +43,7 @@ services:
KONNECTD_ISS: https://${OCIS_DOMAIN:-localhost}:9200
WEB_OIDC_AUTHORITY: https://${OCIS_DOMAIN:-localhost}:9200
WEB_OIDC_METADATA_URL: https://${OCIS_DOMAIN:-localhost}:9200/.well-known/openid-configuration
WEB_CONFIG_SERVER: https://${OCIS_DOMAIN:-localhost}:9200
WEB_UI_CONFIG_SERVER: https://${OCIS_DOMAIN:-localhost}:9200
STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-localhost}:9200
STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-localhost}:9200
# TODO make id the default in ocis-storage
web/pkg/flagset/flagset.go
+5 -5
View File
@@ -154,35 +154,35 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
Name: "web-config",
Value: "",
Usage: "Path to web config",
EnvVars: []string{"WEB_CONFIG"},
EnvVars: []string{"WEB_UI_CONFIG"},
Destination: &cfg.Web.Path,
},
&cli.StringFlag{
Name: "web-config-server",
Value: "https://localhost:9200",
Usage: "Server URL",
EnvVars: []string{"WEB_CONFIG_SERVER"},
EnvVars: []string{"WEB_UI_CONFIG_SERVER"},
Destination: &cfg.Web.Config.Server,
},
&cli.StringFlag{
Name: "web-config-theme",
Value: "owncloud",
Usage: "Theme",
EnvVars: []string{"WEB_CONFIG_THEME"},
EnvVars: []string{"WEB_UI_CONFIG_THEME"},
Destination: &cfg.Web.Config.Theme,
},
&cli.StringFlag{
Name: "web-config-version",
Value: "0.1.0",
Usage: "Version",
EnvVars: []string{"WEB_CONFIG_VERSION"},
EnvVars: []string{"WEB_UI_CONFIG_VERSION"},
Destination: &cfg.Web.Config.Version,
},
&cli.StringSliceFlag{
Name: "web-config-app",
Value: cli.NewStringSlice("files", "media-viewer"),
Usage: `--web-config-app files [--web-config-app draw-io]`,
EnvVars: []string{"WEB_CONFIG_APPS"},
EnvVars: []string{"WEB_UI_CONFIG_APPS"},
},
&cli.StringFlag{
Name: "oidc-metadata-url",