diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml old mode 100644 new mode 100755 index a472adcf1..0c678461e --- a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml +++ b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml @@ -6,46 +6,144 @@ policy_selector: policies: - name: ocis routes: - - endpoint: "/" + - type: "" + method: "" + endpoint: / backend: http://localhost:9100 - - endpoint: "/.well-known/" + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /.well-known/ backend: http://localhost:9130 + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /konnect/ + backend: http://localhost:9130 + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /signin/ + backend: http://localhost:9130 + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /archiver + backend: http://localhost:9140 + service: "" + apache_vhost: false - type: regex - endpoint: "/ocs/v[12].php/cloud/user/signing-key" + method: "" + endpoint: /ocs/v[12].php/cloud/user/signing-key backend: http://localhost:9110 - - endpoint: "/ocs/" + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /ocs/ backend: http://localhost:9140 + service: "" + apache_vhost: false - type: query - endpoint: "/remote.php/?preview=1" + method: "" + endpoint: /remote.php/?preview=1 backend: http://localhost:9115 - - endpoint: "/remote.php/" + service: "" + apache_vhost: false + - type: "" + method: REPORT + endpoint: /remote.php/dav/ + backend: http://localhost:9115 + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /remote.php/ + backend: "" + service: ocdav + apache_vhost: false + - type: "" + method: "" + endpoint: /dav/ + backend: "" + service: ocdav + apache_vhost: false + - type: "" + method: "" + endpoint: /webdav/ + backend: "" + service: ocdav + apache_vhost: false + - type: "" + method: "" + endpoint: /status.php + backend: "" + service: ocdav + apache_vhost: false + - type: "" + method: "" + endpoint: /index.php/ + backend: "" + service: ocdav + apache_vhost: false + - type: "" + method: "" + endpoint: /apps/ + backend: "" + service: ocdav + apache_vhost: false + - type: "" + method: "" + endpoint: /data backend: http://localhost:9140 - - endpoint: "/dav/" + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /app/ backend: http://localhost:9140 - - endpoint: "/webdav/" - backend: http://localhost:9140 - - endpoint: "/status.php" - backend: http://localhost:9140 - - endpoint: "/index.php/" - backend: http://localhost:9140 - - endpoint: "/index.php/login" - backend: http://localhost:9100 - - endpoint: "/login" - backend: http://localhost:9100 - - endpoint: "/data" - backend: http://localhost:9140 - - endpoint: "/graph/" + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /graph/ backend: http://localhost:9120 - - endpoint: "/app/" - backend: http://localhost:9140 - - endpoint: "/archiver" - backend: http://localhost:9140 - - endpoint: "/graph-explorer/" + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /graph-explorer backend: http://localhost:9135 - - endpoint: "/api/v0/settings" + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /api/v0/accounts + backend: http://localhost:9181 + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /accounts.js + backend: http://localhost:9181 + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /api/v0/settings backend: http://localhost:9190 - - endpoint: "/settings.js" + service: "" + apache_vhost: false + - type: "" + method: "" + endpoint: /settings.js backend: http://localhost:9190 + service: "" + apache_vhost: false - name: oc10 routes: - endpoint: "/" diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index 053eeebfc..2cc505ef7 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -43,11 +43,30 @@ services: driver: "local" restart: always + ocis-init-volumes: + image: busybox + entrypoint: + - /bin/sh + # prepare the oCIS config volume for oCIS + command: ["-c", "chown -R 33:33 /etc/ocis /var/lib/ocis"] + volumes: + - ocis-config:/etc/ocis + - ocis-data:/var/lib/ocis + ocis: image: owncloud/ocis:${OCIS_DOCKER_TAG:-latest} networks: ocis-net: user: "33:33" # equals the user "www-data" for oC10 + entrypoint: + - /bin/sh + # run ocis init to initialize a configuration file with random secrets + # it will fail on subsequent runs, because the config file already exists + # therefore we ignore the error and then start the ocis server + command: ["-c", "ocis init || true; ocis server"] + #entrypoint: + # - /bin/sh + # - /entrypoint-override.sh environment: # Keycloak IDP specific configuration OCIS_OIDC_ISSUER: https://${KEYCLOAK_DOMAIN:-keycloak.owncloud.test}/auth/realms/${KEYCLOAK_REALM:-owncloud} @@ -97,13 +116,13 @@ services: SHARING_USER_OWNCLOUDSQL_DB_USERNAME: "owncloud" SHARING_USER_OWNCLOUDSQL_DB_PASSWORD: "owncloud" SHARING_USER_OWNCLOUDSQL_DB_HOST: "oc10-db" - SHARING_USER_OWNCLOUDSQL_DB_PORT: 330 + SHARING_USER_OWNCLOUDSQL_DB_PORT: 3306 SHARING_USER_OWNCLOUDSQL_DB_NAME: "owncloud" # ownCloud storage readonly OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303 # General oCIS config # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idp and accounts. These are replaced by external services - OCIS_RUN_EXTENSIONS: settings,storage-system,graph,graph-explorer,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,auth-machine,storage-users,storage-shares,storage-publiclink,app-provider,sharing,proxy,nats + OCIS_RUN_EXTENSIONS: app-registry,app-provider,audit,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test} PROXY_TLS: "false" # do not use SSL between Traefik and oCIS @@ -120,6 +139,7 @@ services: IDM_CREATE_DEMO_USERS: "${DEMO_USERS:-false}" volumes: - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml + - ocis-config:/etc/ocis - ocis-data:/var/lib/ocis # shared volume with oC10 - oc10-data:/mnt/data @@ -334,6 +354,7 @@ services: volumes: certs: + ocis-config: ocis-data: keycloak-postgres-data: oc10-mysql-data: