diff --git a/deployments/examples/ocis_web/config/ocis/proxy.json b/deployments/examples/ocis_web/config/ocis/proxy.json deleted file mode 100644 index 0464381f5c0..00000000000 --- a/deployments/examples/ocis_web/config/ocis/proxy.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "HTTP": { - "Namespace": "com.owncloud" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://web:8080" - }, - { - "endpoint": "/config.json", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/(users?|groups)", - "backend": "http://localhost:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://localhost:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://localhost:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/dav/", - "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": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/accounts", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/accounts.js", - "backend": "http://localhost:9181" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - } - ] -} diff --git a/deployments/examples/ocis_web/config/ocis/proxy.yaml b/deployments/examples/ocis_web/config/ocis/proxy.yaml new file mode 100644 index 00000000000..7ddc10f1d39 --- /dev/null +++ b/deployments/examples/ocis_web/config/ocis/proxy.yaml @@ -0,0 +1,53 @@ +--- +policy_selector: + static: + policy: ocis +policies: + - name: ocis + routes: + - endpoint: "/" + backend: http://web:8080 + - endpoint: "/config.json" + backend: http://localhost:9100 + - endpoint: "/.well-known/" + backend: http://localhost:9130 + - endpoint: "/konnect/" + backend: http://localhost:9130 + - endpoint: "/signin/" + backend: http://localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/(users?|groups)" + backend: http://localhost:9110 + - endpoint: "/ocs/" + backend: http://localhost:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http://localhost:9115 + - endpoint: "/remote.php/" + backend: http://localhost:9140 + - endpoint: "/dav/" + 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: "/data" + backend: http://localhost:9140 + - endpoint: "/app/" + backend: http://localhost:9140 + - endpoint: "/archiver" + backend: http://localhost:9140 + - endpoint: "/graph/" + backend: http://localhost:9120 + - endpoint: "/graph-explorer/" + backend: http://localhost:9135 + - endpoint: "/api/v0/accounts" + backend: http://localhost:9181 + - endpoint: "/accounts.js" + backend: http://localhost:9181 + - endpoint: "/api/v0/settings" + backend: http://localhost:9190 + - endpoint: "/settings.js" + backend: http://localhost:9190 diff --git a/deployments/examples/ocis_web/docker-compose.yml b/deployments/examples/ocis_web/docker-compose.yml index 055bef77c77..7ef0fc97ba9 100644 --- a/deployments/examples/ocis_web/docker-compose.yml +++ b/deployments/examples/ocis_web/docker-compose.yml @@ -71,7 +71,7 @@ services: OCIS_INSECURE: "${INSECURE:-false}" volumes: - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh - - ./config/ocis/proxy.json:/etc/ocis/proxy.json + - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - ./config/ocis/mimetypes.json:/var/tmp/ocis/app-config/mimetypes.json - ocis-data:/var/lib/ocis labels: