use default paths

This commit is contained in:
Willy Kloucek
2020-12-11 09:36:55 +01:00
parent 78d2647a48
commit 80c8fd3fea
6 changed files with 10 additions and 47 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
--- ---
document this deployment example in docs/ocis/deployment/ocis_keycloak.md document this deployment example in: docs/ocis/deployment/ocis_keycloak.md
--- ---
Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/ocis_keycloak/) Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/ocis_keycloak/)
@@ -63,17 +63,8 @@ services:
STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data
STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/ STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/
STORAGE_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test} STORAGE_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}
STORAGE_METADATA_ROOT: /opt/ocis-metadata
STORAGE_DRIVER_OCIS_ROOT: /opt/ocis-storage
# store config
STORE_DATA_PATH: /opt/ocis-store
# settings config
SETTINGS_DATA_PATH: /opt/ocis-settings
volumes: volumes:
- ocis-storage:/opt/ocis-storage - ocis-data:/var/tmp/ocis
- ocis-metadata:/opt/ocis-metadata
- ocis-store:/opt/ocis-store
- ocis-settings:/opt/ocis-settings
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.ocis.entrypoints=http" - "traefik.http.routers.ocis.entrypoints=http"
@@ -129,8 +120,4 @@ services:
volumes: volumes:
certs: certs:
ocis-storage: ocis-data:
ocis-metadata:
ocis-store:
ocis-settings:
keycloak_postgres_data:
+2 -2
View File
@@ -1,6 +1,6 @@
--- ---
document this deployment example in docs/ocis/deployment/owncloud10_with_ocis_web.md document this deployment example in: docs/ocis/deployment/ocis_traefik.md
--- ---
Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/owncloud10_with_ocis_web/) Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/ocis_traefik/)
for instructions on how to deploy this scenario. for instructions on how to deploy this scenario.
@@ -68,21 +68,12 @@ services:
STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data
STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/ STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/
STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test} STORAGE_OIDC_ISSUER: https://${OCIS_DOMAIN:-ocis.owncloud.test}
STORAGE_METADATA_ROOT: /opt/ocis-metadata
STORAGE_DRIVER_OCIS_ROOT: /opt/ocis-storage
# store config
STORE_DATA_PATH: /opt/ocis-store
# settings config
SETTINGS_DATA_PATH: /opt/ocis-settings
# idp config # idp config
KONNECTD_ISS: https://${OCIS_DOMAIN:-ocis.owncloud.test} KONNECTD_ISS: https://${OCIS_DOMAIN:-ocis.owncloud.test}
KONNECTD_TLS: 'false' KONNECTD_TLS: 'false'
volumes: volumes:
- ./config:/config - ./config:/config
- ocis-storage:/opt/ocis-storage - ocis-data:/var/tmp/ocis
- ocis-metadata:/opt/ocis-metadata
- ocis-store:/opt/ocis-store
- ocis-settings:/opt/ocis-settings
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.ocis.entrypoints=http" - "traefik.http.routers.ocis.entrypoints=http"
@@ -99,7 +90,4 @@ services:
volumes: volumes:
certs: certs:
ocis-storage: ocis-data:
ocis-metadata:
ocis-store:
ocis-settings:
@@ -1,5 +1,5 @@
--- ---
document this deployment example in docs/ocis/deployment/ocis_oc10_backend.md document this deployment example in: docs/ocis/deployment/owncloud10_with_oc_web.md
--- ---
Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/owncloud10_with_oc_web/) Please refer to [our documentation](https://owncloud.github.io/ocis/deployment/owncloud10_with_oc_web/)
@@ -105,18 +105,9 @@ services:
STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test} STORAGE_FRONTEND_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data STORAGE_DATAGATEWAY_PUBLIC_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}/data
STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-ocis.owncloud.test} STORAGE_LDAP_IDP: https://${OCIS_DOMAIN:-ocis.owncloud.test}
STORAGE_METADATA_ROOT: /opt/ocis-metadata
STORAGE_DRIVER_OCIS_ROOT: /opt/ocis-storage
# store config
STORE_DATA_PATH: /opt/ocis-store
# settings config
SETTINGS_DATA_PATH: /opt/ocis-settings
volumes: volumes:
- ./config/ocis:/config - ./config/ocis:/config
- ocis-storage:/opt/ocis-storage - ocis-data:/var/tmp/ocis
- ocis-metadata:/opt/ocis-metadata
- ocis-store:/opt/ocis-store
- ocis-settings:/opt/ocis-settings
labels: labels:
- "traefik.enable=true" - "traefik.enable=true"
- "traefik.http.routers.ocis.entrypoints=http" - "traefik.http.routers.ocis.entrypoints=http"
@@ -204,10 +195,7 @@ services:
volumes: volumes:
certs: certs:
ocis-storage: ocis-data:
ocis-metadata:
ocis-store:
ocis-settings:
files: files:
driver: local driver: local
mysql: mysql: