sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unneeded settings

Browse Source
This commit is contained in:
Willy Kloucek
2020-12-23 23:36:00 +01:00
parent 986b7a82b3
commit 3eb9e122a4
8 changed files with 20 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployments/examples/cs3_users_ocis/config/ocis/.gitignore
-1
View File
@@ -1 +0,0 @@
identifier-registration.yaml
deployments/examples/cs3_users_ocis/config/ocis/identifier-registration.dist.yaml
-41
View File
@@ -1,41 +0,0 @@
---
# OpenID Connect client registry.
clients:
- id: web
name: OCIS
application_type: web
insecure: yes
trusted: yes
redirect_uris:
- https://ocis.owncloud.test/
- https://ocis.owncloud.test/oidc-callback.html
- https://ocis.owncloud.test/oidc-silent-redirect.html
origins:
- https://ocis.owncloud.test
- id: ocis-explorer.js
name: oCIS Graph Explorer
trusted: yes
insecure: yes
- id: xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69
secret: UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh
name: ownCloud desktop app
application_type: native
insecure: true
- id: e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD
secret: dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD
name: ownCloud Android app
application_type: native
redirect_uris:
- oc://android.owncloud.com
- id: mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1
secret: KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx
name: ownCloud iOS app
application_type: native
redirect_uris:
- oc://ios.owncloud.com
- oc.ios://ios.owncloud.com
deployments/examples/cs3_users_ocis/config/ocis/proxy-config.json
+4 -4
View File
@@ -62,13 +62,13 @@
}, },
{ {
"endpoint": "/api/v0/settings", "endpoint": "/api/v0/settings",
"backend": "http://localhost:9190" "backend": "http://localhost:9190"
}, },
{ {
"endpoint": "/settings.js", "endpoint": "/settings.js",
"backend": "http://localhost:9190" "backend": "http://localhost:9190"
}, },
{ {
"endpoint": "/api/v0/greet", "endpoint": "/api/v0/greet",
"backend": "http://localhost:9105" "backend": "http://localhost:9105"
}, },
deployments/examples/cs3_users_ocis/docker-compose.yaml
+5 -17
View File
@@ -18,6 +18,7 @@ services:
- "--entryPoints.https.address=:443" - "--entryPoints.https.address=:443"
- "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.endpoint=unix:///var/run/docker.sock"
- "--providers.docker.exposedByDefault=false" - "--providers.docker.exposedByDefault=false"
- "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -41,17 +42,10 @@ services:
ocis: ocis:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
entrypoint:
- /bin/sh
- -c
- | # as long as https://github.com/owncloud/product/issues/15 is open we need this step to template konnectd config
cp /config/identifier-registration.dist.yaml /config/identifier-registration.yaml
sed -i 's/ocis.owncloud.test/${OCIS_DOMAIN:-ocis.owncloud.test}/g' /config/identifier-registration.yaml
ocis server
depends_on: depends_on:
- ldap-server - ldap-server
environment: environment:
# CS3 users frpm ldap specific config # CS3 users from ldap specific configuration
PROXY_CONFIG_FILE: "/config/proxy-config.json" PROXY_CONFIG_FILE: "/config/proxy-config.json"
LDAP_FILTER: "(&(objectclass=inetOrgPerson)(objectClass=owncloud))" LDAP_FILTER: "(&(objectclass=inetOrgPerson)(objectClass=owncloud))"
LDAP_URI: ldap://ldap-server:389 LDAP_URI: ldap://ldap-server:389
@@ -74,17 +68,10 @@ services:
STORAGE_LDAP_GROUPFILTER: '(&(objectclass=groupOfUniqueNames)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))' STORAGE_LDAP_GROUPFILTER: '(&(objectclass=groupOfUniqueNames)(objectclass=owncloud)(ownclouduuid={{.OpaqueId}}*))'
# General ocis config # General ocis config
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: error OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
# proxy config
PROXY_OIDC_INSECURE: "${INSECURE:-false}" PROXY_OIDC_INSECURE: "${INSECURE:-false}"
PROXY_TLS: "false"
# web config
WEB_UI_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
# storage config
# idp config
KONNECTD_TLS: 'false'
volumes: volumes:
- ./config/ocis:/config - ./config/ocis/proxy-config.json:/config/proxy-config.json
- ocis-data:/var/tmp/ocis - ocis-data:/var/tmp/ocis
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@@ -98,6 +85,7 @@ services:
- "traefik.http.routers.ocis-secure.tls.certresolver=http" - "traefik.http.routers.ocis-secure.tls.certresolver=http"
- "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.routers.ocis-secure.service=ocis"
- "traefik.http.services.ocis.loadbalancer.server.port=9200" - "traefik.http.services.ocis.loadbalancer.server.port=9200"
- "traefik.http.services.ocis.loadbalancer.server.scheme=https"
restart: always restart: always
ldap-server: ldap-server:
deployments/examples/ocis_keycloak/docker-compose.yml
+7 -11
View File
@@ -38,6 +38,7 @@ services:
- "traefik.http.routers.traefik-secure.tls=true" - "traefik.http.routers.traefik-secure.tls=true"
- "traefik.http.routers.traefik-secure.tls.certresolver=http" - "traefik.http.routers.traefik-secure.tls.certresolver=http"
- "traefik.http.routers.traefik-secure.service=api@internal" - "traefik.http.routers.traefik-secure.service=api@internal"
- "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate
restart: always restart: always
ocis: ocis:
@@ -45,24 +46,18 @@ services:
networks: networks:
default: default:
environment: environment:
# general config # Keycloak IDP specific configuration
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error}
# proxy config
PROXY_AUTOPROVISION_ACCOUNTS: "true" PROXY_AUTOPROVISION_ACCOUNTS: "true"
PROXY_OIDC_INSECURE: "${INSECURE:-false}"
PROXY_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master} PROXY_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}
PROXY_TLS: "false"
# ownCloud Web config
WEB_OIDC_AUTHORITY: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master} 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_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_OIDC_METADATA_URL: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-master}/.well-known/openid-configuration
WEB_UI_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
# storage config
STORAGE_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test} STORAGE_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}
STORAGE_LDAP_IDP: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test} STORAGE_LDAP_IDP: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}
# thumbnail config # general config
THUMBNAILS_WEBDAVSOURCE_BASEURL: http://localhost:9200/remote.php/webdav/ OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates
volumes: volumes:
- ocis-data:/var/tmp/ocis - ocis-data:/var/tmp/ocis
labels: labels:
@@ -77,6 +72,7 @@ services:
- "traefik.http.routers.ocis-secure.tls.certresolver=http" - "traefik.http.routers.ocis-secure.tls.certresolver=http"
- "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.routers.ocis-secure.service=ocis"
- "traefik.http.services.ocis.loadbalancer.server.port=9200" - "traefik.http.services.ocis.loadbalancer.server.port=9200"
- "traefik.http.services.ocis.loadbalancer.server.scheme=https"
restart: always restart: always
postgres: postgres:
deployments/examples/ocis_traefik/config/.gitignore
-1
View File
@@ -1 +0,0 @@
identifier-registration.yaml
deployments/examples/ocis_traefik/config/identifier-registration.dist.yaml
-41
View File
@@ -1,41 +0,0 @@
---
# OpenID Connect client registry.
clients:
- id: web
name: OCIS
application_type: web
insecure: yes
trusted: yes
redirect_uris:
- https://ocis.owncloud.test/
- https://ocis.owncloud.test/oidc-callback.html
- https://ocis.owncloud.test/oidc-silent-redirect.html
origins:
- https://ocis.owncloud.test
- id: ocis-explorer.js
name: oCIS Graph Explorer
trusted: yes
insecure: yes
- id: xdXOt13JKxym1B1QcEncf2XDkLAexMBFwiT9j6EfhhHFJhs2KM9jbjTmf8JBXE69
secret: UBntmLjC2yYCeHwsyj73Uwo9TAaecAetRwMw0xYcvNL9yRdLSUi0hUAHfvCHFeFh
name: ownCloud desktop app
application_type: native
insecure: true
- id: e4rAsNUSIUs0lF4nbv9FmCeUkTlV9GdgTLDH1b5uie7syb90SzEVrbN7HIpmWJeD
secret: dInFYGV33xKzhbRmpqQltYNdfLdJIfJ9L5ISoKhNoT9qZftpdWSP71VrpGR9pmoD
name: ownCloud Android app
application_type: native
redirect_uris:
- oc://android.owncloud.com
- id: mxd5OQDk6es5LzOzRvidJNfXLUZS2oN3oUFeXPP8LpPrhx3UroJFduGEYIBOxkY1
secret: KFeFWWEZO9TkisIQzR3fo7hfiMXlOpaqP8CFuTbSHzV1TUuGECglPxpiVKJfOXIx
name: ownCloud iOS app
application_type: native
redirect_uris:
- oc://ios.owncloud.com
- oc.ios://ios.owncloud.com
deployments/examples/ocis_traefik/docker-compose.yml
+4 -21
View File
@@ -18,6 +18,7 @@ services:
- "--entryPoints.https.address=:443" - "--entryPoints.https.address=:443"
- "--providers.docker.endpoint=unix:///var/run/docker.sock" - "--providers.docker.endpoint=unix:///var/run/docker.sock"
- "--providers.docker.exposedByDefault=false" - "--providers.docker.exposedByDefault=false"
- "--serversTransport.insecureSkipVerify=true" # oCIS uses self generated certificate
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
@@ -41,32 +42,13 @@ services:
ocis: ocis:
image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest}
entrypoint:
- /bin/sh
- -c
- | # as long as https://github.com/owncloud/product/issues/15 is open we need this step to template konnectd config
cp /config/identifier-registration.dist.yaml /config/identifier-registration.yaml
sed -i 's/ocis.owncloud.test/${OCIS_DOMAIN:-ocis.owncloud.test}/g' /config/identifier-registration.yaml
ocis server
networks: networks:
default: default:
environment: environment:
# general config
OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
# proxy config PROXY_OIDC_INSECURE: "${INSECURE:-false}" # needed if Traefik is using self generated certificates
PROXY_OIDC_INSECURE: "${INSECURE:-false}"
PROXY_TLS: "false"
# web config
WEB_UI_CONFIG_APPS: files,draw-io,markdown-editor,media-viewer
# storage config
STORAGE_OIDC_INSECURE: "${INSECURE:-false}"
# idp config
KONNECTD_TLS: 'false'
# thumbnail config
THUMBNAILS_WEBDAVSOURCE_BASEURL: http://localhost:9200/remote.php/webdav/
volumes: volumes:
- ./config:/config
- ocis-data:/var/tmp/ocis - ocis-data:/var/tmp/ocis
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
@@ -80,6 +62,7 @@ services:
- "traefik.http.routers.ocis-secure.tls.certresolver=http" - "traefik.http.routers.ocis-secure.tls.certresolver=http"
- "traefik.http.routers.ocis-secure.service=ocis" - "traefik.http.routers.ocis-secure.service=ocis"
- "traefik.http.services.ocis.loadbalancer.server.port=9200" - "traefik.http.services.ocis.loadbalancer.server.port=9200"
- "traefik.http.services.ocis.loadbalancer.server.scheme=https"
restart: always restart: always
volumes: volumes: