From 551e38e21f09a4b48f8de3a3268e684c55cd5866 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:17:44 +0100 Subject: [PATCH 1/8] drop json config support --- ocis-pkg/config/helpers.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/ocis-pkg/config/helpers.go b/ocis-pkg/config/helpers.go index 7da572a35f2..eac108963ba 100644 --- a/ocis-pkg/config/helpers.go +++ b/ocis-pkg/config/helpers.go @@ -7,7 +7,6 @@ import ( "strings" gofig "github.com/gookit/config/v2" - goojson "github.com/gookit/config/v2/json" gooyaml "github.com/gookit/config/v2/yaml" ) @@ -22,7 +21,6 @@ var ( supportedExtensions = []string{ "yaml", "yml", - "json", } ) @@ -73,7 +71,6 @@ func BindSourcesToStructs(extension string, dst interface{}) (*gofig.Config, err options.DecoderConfig.TagName = "ocisConfig" }) cnf.AddDriver(gooyaml.Driver) - cnf.AddDriver(goojson.Driver) _ = cnf.LoadFiles(sources...) err := cnf.BindStruct("", &dst) From a81ba03d558bdd9ac1fa95cf2dc5413f5bb73065 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:18:03 +0100 Subject: [PATCH 2/8] switch deployment examples to yaml config --- .../oc10_ocis_parallel/config/ocis/proxy.json | 109 ----------------- .../oc10_ocis_parallel/config/ocis/proxy.yaml | 54 +++++++++ .../oc10_ocis_parallel/docker-compose.yml | 3 +- .../ocis_hello/config/ocis/proxy.json | 111 ------------------ .../ocis_hello/config/ocis/proxy.yaml | 55 +++++++++ .../examples/ocis_hello/docker-compose.yml | 2 +- .../config/proxy/proxy.json | 103 ---------------- .../config/proxy/proxy.yaml | 51 ++++++++ .../docker-compose.yml | 2 +- .../examples/ocis_ldap/config/ocis/proxy.json | 95 --------------- .../examples/ocis_ldap/config/ocis/proxy.yaml | 47 ++++++++ .../examples/ocis_ldap/docker-compose.yml | 2 +- 12 files changed, 211 insertions(+), 423 deletions(-) delete mode 100644 deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json create mode 100644 deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml delete mode 100644 deployments/examples/ocis_hello/config/ocis/proxy.json create mode 100644 deployments/examples/ocis_hello/config/ocis/proxy.yaml delete mode 100644 deployments/examples/ocis_individual_services/config/proxy/proxy.json create mode 100644 deployments/examples/ocis_individual_services/config/proxy/proxy.yaml delete mode 100644 deployments/examples/ocis_ldap/config/ocis/proxy.json create mode 100644 deployments/examples/ocis_ldap/config/ocis/proxy.yaml diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json deleted file mode 100644 index 6333545dac0..00000000000 --- a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "log": { - "level": "PROXY_LOG_LEVEL" - }, - "policy_selector": { - "claims": { - "default_policy": "oc10", - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/user/signing-key", - "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": "/index.php/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://oc10:8080" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - } - ] - } - ] -} diff --git a/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml new file mode 100644 index 00000000000..a472adcf12c --- /dev/null +++ b/deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml @@ -0,0 +1,54 @@ +--- +policy_selector: + claims: + default_policy: oc10 + unauthenticated_policy: oc10 +policies: + - name: ocis + routes: + - endpoint: "/" + backend: http://localhost:9100 + - endpoint: "/.well-known/" + backend: http://localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/user/signing-key" + 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: "/index.php/login" + backend: http://localhost:9100 + - endpoint: "/login" + backend: http://localhost:9100 + - endpoint: "/data" + backend: http://localhost:9140 + - endpoint: "/graph/" + backend: http://localhost:9120 + - endpoint: "/app/" + backend: http://localhost:9140 + - endpoint: "/archiver" + backend: http://localhost:9140 + - endpoint: "/graph-explorer/" + backend: http://localhost:9135 + - endpoint: "/api/v0/settings" + backend: http://localhost:9190 + - endpoint: "/settings.js" + backend: http://localhost:9190 + - name: oc10 + routes: + - endpoint: "/" + backend: http://oc10:8080 + - endpoint: "/data" + backend: http://localhost:9140 diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml index fce87848eab..677877f5b27 100644 --- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml +++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml @@ -116,7 +116,6 @@ services: 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 - PROXY_CONFIG_FILE: "/var/tmp/ocis/.config/proxy-config.json" # change default secrets OCIS_JWT_SECRET: ${OCIS_JWT_SECRET:-Pive-Fumkiu4} STORAGE_TRANSFER_SECRET: ${STORAGE_TRANSFER_SECRET:-replace-me-with-a-transfer-secret} @@ -126,7 +125,7 @@ services: # basic auth (not recommended, but needed for eg. WebDav clients that do not support OpenID Connect) PROXY_ENABLE_BASIC_AUTH: "${PROXY_ENABLE_BASIC_AUTH:-false}" volumes: - - ./config/ocis/proxy.json:/etc/ocis/proxy.json + - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - ocis-data:/var/lib/ocis # shared volume with oC10 - oc10-data:/mnt/data diff --git a/deployments/examples/ocis_hello/config/ocis/proxy.json b/deployments/examples/ocis_hello/config/ocis/proxy.json deleted file mode 100644 index fd1ea363156..00000000000 --- a/deployments/examples/ocis_hello/config/ocis/proxy.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "HTTP": { - "Namespace": "com.owncloud" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "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" - }, - { - "endpoint": "/api/v0/greet", - "backend": "http://ocis-hello:9105" - }, - { - "endpoint": "/hello.js", - "backend": "http://ocis-hello:9105" - } - ] - } - ] -} \ No newline at end of file diff --git a/deployments/examples/ocis_hello/config/ocis/proxy.yaml b/deployments/examples/ocis_hello/config/ocis/proxy.yaml new file mode 100644 index 00000000000..432398165fa --- /dev/null +++ b/deployments/examples/ocis_hello/config/ocis/proxy.yaml @@ -0,0 +1,55 @@ +--- +policy_selector: + static: + policy: ocis +policies: + - name: ocis + routes: + - endpoint: "/" + 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 + - endpoint: "/api/v0/greet" + backend: http://ocis-hello:9105 + - endpoint: "/hello.js" + backend: http://ocis-hello:9105 diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml index 3a6d0c8325a..9b72e1f59f7 100644 --- a/deployments/examples/ocis_hello/docker-compose.yml +++ b/deployments/examples/ocis_hello/docker-compose.yml @@ -71,7 +71,7 @@ services: volumes: - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh - ./config/ocis/web-config.dist.json:/config/web-config.dist.json - - ./config/ocis/proxy.json:/etc/ocis/proxy.json + - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - ocis-data:/var/lib/ocis labels: - "traefik.enable=true" diff --git a/deployments/examples/ocis_individual_services/config/proxy/proxy.json b/deployments/examples/ocis_individual_services/config/proxy/proxy.json deleted file mode 100644 index 3874ceff194..00000000000 --- a/deployments/examples/ocis_individual_services/config/proxy/proxy.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "HTTP": { - "Namespace": "com.owncloud" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://web:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://idp:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://idp:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://idp:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/(users?|groups)", - "backend": "http://ocs:9110" - }, - { - "endpoint": "/ocs/", - "backend": "http://storage-frontend:9140" - }, - { - "type": "query", - "endpoint": "/remote.php/?preview=1", - "backend": "http://webdav:9115" - }, - { - "endpoint": "/remote.php/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/dav/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/webdav/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/status.php", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/index.php/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/data", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/app/", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://storage-frontend:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://graph:9120" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://graph-explorer:9135" - }, - { - "endpoint": "/api/v0/accounts", - "backend": "http://accounts:9181" - }, - { - "endpoint": "/accounts.js", - "backend": "http://accounts:9181" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://settings:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://settings:9190" - } - ] - } - ] -} \ No newline at end of file diff --git a/deployments/examples/ocis_individual_services/config/proxy/proxy.yaml b/deployments/examples/ocis_individual_services/config/proxy/proxy.yaml new file mode 100644 index 00000000000..c2395889805 --- /dev/null +++ b/deployments/examples/ocis_individual_services/config/proxy/proxy.yaml @@ -0,0 +1,51 @@ +--- +policy_selector: + static: + policy: ocis +policies: + - name: ocis + routes: + - endpoint: "/" + backend: http://web:9100 + - endpoint: "/.well-known/" + backend: http://idp:9130 + - endpoint: "/konnect/" + backend: http://idp:9130 + - endpoint: "/signin/" + backend: http://idp:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/(users?|groups)" + backend: http://ocs:9110 + - endpoint: "/ocs/" + backend: http://storage-frontend:9140 + - type: query + endpoint: "/remote.php/?preview=1" + backend: http://webdav:9115 + - endpoint: "/remote.php/" + backend: http://storage-frontend:9140 + - endpoint: "/dav/" + backend: http://storage-frontend:9140 + - endpoint: "/webdav/" + backend: http://storage-frontend:9140 + - endpoint: "/status.php" + backend: http://storage-frontend:9140 + - endpoint: "/index.php/" + backend: http://storage-frontend:9140 + - endpoint: "/data" + backend: http://storage-frontend:9140 + - endpoint: "/app/" + backend: http://storage-frontend:9140 + - endpoint: "/archiver" + backend: http://storage-frontend:9140 + - endpoint: "/graph/" + backend: http://graph:9120 + - endpoint: "/graph-explorer/" + backend: http://graph-explorer:9135 + - endpoint: "/api/v0/accounts" + backend: http://accounts:9181 + - endpoint: "/accounts.js" + backend: http://accounts:9181 + - endpoint: "/api/v0/settings" + backend: http://settings:9190 + - endpoint: "/settings.js" + backend: http://settings:9190 diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml index dda52fb6359..8c30ac2b2dd 100644 --- a/deployments/examples/ocis_individual_services/docker-compose.yml +++ b/deployments/examples/ocis_individual_services/docker-compose.yml @@ -72,7 +72,7 @@ services: PROXY_HTTP_ADDR: 0.0.0.0:9200 volumes: - - "./config/proxy/proxy.json:/etc/ocis/proxy.json" + - "./config/proxy/proxy.yaml:/etc/ocis/proxy.yaml" labels: - "traefik.enable=true" - "traefik.http.routers.ocis.entrypoints=https" diff --git a/deployments/examples/ocis_ldap/config/ocis/proxy.json b/deployments/examples/ocis_ldap/config/ocis/proxy.json deleted file mode 100644 index 76285d79b4e..00000000000 --- a/deployments/examples/ocis_ldap/config/ocis/proxy.json +++ /dev/null @@ -1,95 +0,0 @@ -{ - "HTTP": { - "Namespace": "com.owncloud" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "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/user/signing-key", - "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": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - } - ] -} \ No newline at end of file diff --git a/deployments/examples/ocis_ldap/config/ocis/proxy.yaml b/deployments/examples/ocis_ldap/config/ocis/proxy.yaml new file mode 100644 index 00000000000..b303cd63d94 --- /dev/null +++ b/deployments/examples/ocis_ldap/config/ocis/proxy.yaml @@ -0,0 +1,47 @@ +--- +policy_selector: + static: + policy: ocis +policies: + - name: ocis + routes: + - endpoint: "/" + 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/user/signing-key" + 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: "/app/" + backend: http://localhost:9140 + - endpoint: "/archiver" + backend: http://localhost:9140 + - endpoint: "/data" + backend: http://localhost:9140 + - endpoint: "/graph/" + backend: http://localhost:9120 + - endpoint: "/graph-explorer/" + backend: http://localhost:9135 + - endpoint: "/api/v0/settings" + backend: http://localhost:9190 + - endpoint: "/settings.js" + backend: http://localhost:9190 diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml index fb702d4537c..60c22c280eb 100644 --- a/deployments/examples/ocis_ldap/docker-compose.yml +++ b/deployments/examples/ocis_ldap/docker-compose.yml @@ -91,7 +91,7 @@ services: volumes: - ./config/ocis/entrypoint-override.sh:/entrypoint-override.sh - ./config/ocis/web-config.dist.json:/config/web-config.dist.json - - ./config/ocis/proxy.json:/etc/ocis/proxy.json + - ./config/ocis/proxy.yaml:/etc/ocis/proxy.yaml - ocis-data:/var/lib/ocis labels: - "traefik.enable=true" From 5d190620751781c1945f36086939d3eb8492fe46 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:18:30 +0100 Subject: [PATCH 3/8] switch tests to yaml config --- .drone.star | 2 +- .../drone/ocis/proxy.json | 109 ------------------ .../drone/ocis/proxy.yaml | 54 +++++++++ 3 files changed, 55 insertions(+), 110 deletions(-) delete mode 100644 tests/parallelDeployAcceptance/drone/ocis/proxy.json create mode 100644 tests/parallelDeployAcceptance/drone/ocis/proxy.yaml diff --git a/.drone.star b/.drone.star index e5e702c3512..faf0739e858 100644 --- a/.drone.star +++ b/.drone.star @@ -2272,7 +2272,7 @@ def copyConfigs(): "commands": [ # ocis proxy config "mkdir -p /etc/ocis", - "cp %s/ocis/proxy.json /etc/ocis/proxy.json" % (PARALLEL_DEPLOY_CONFIG_PATH), + "cp %s/ocis/proxy.yaml /etc/ocis/proxy.yaml" % (PARALLEL_DEPLOY_CONFIG_PATH), # oc10 configs "mkdir -p /etc/templates", "mkdir -p /etc/pre_server.d", diff --git a/tests/parallelDeployAcceptance/drone/ocis/proxy.json b/tests/parallelDeployAcceptance/drone/ocis/proxy.json deleted file mode 100644 index 6333545dac0..00000000000 --- a/tests/parallelDeployAcceptance/drone/ocis/proxy.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "log": { - "level": "PROXY_LOG_LEVEL" - }, - "policy_selector": { - "claims": { - "default_policy": "oc10", - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "type": "regex", - "endpoint": "/ocs/v[12].php/cloud/user/signing-key", - "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": "/index.php/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/login", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/graph-explorer/", - "backend": "http://localhost:9135" - }, - { - "endpoint": "/api/v0/settings", - "backend": "http://localhost:9190" - }, - { - "endpoint": "/settings.js", - "backend": "http://localhost:9190" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://oc10:8080" - }, - { - "endpoint": "/data", - "backend": "http://localhost:9140" - } - ] - } - ] -} diff --git a/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml new file mode 100644 index 00000000000..2d1a6aced43 --- /dev/null +++ b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml @@ -0,0 +1,54 @@ +--- +policy_selector: + claims: + default_policy: oc10 + unauthenticated_policy: oc10 +policies: +- name: ocis + routes: + - endpoint: "/" + backend: http: //localhost:9100 + - endpoint: "/.well-known/" + backend: http: //localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/user/signing-key" + 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: "/index.php/login" + backend: http: //localhost:9100 + - endpoint: "/login" + backend: http: //localhost:9100 + - endpoint: "/data" + backend: http: //localhost:9140 + - endpoint: "/graph/" + backend: http: //localhost:9120 + - endpoint: "/app/" + backend: http: //localhost:9140 + - endpoint: "/archiver" + backend: http: //localhost:9140 + - endpoint: "/graph-explorer/" + backend: http: //localhost:9135 + - endpoint: "/api/v0/settings" + backend: http: //localhost:9190 + - endpoint: "/settings.js" + backend: http: //localhost:9190 +- name: oc10 + routes: + - endpoint: "/" + backend: http: //oc10:8080 + - endpoint: "/data" + backend: http: //localhost:9140 From f67e6242ee14e88a6df208e0078922a10bf3ef79 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:18:50 +0100 Subject: [PATCH 4/8] fix config edit path --- docs/ocis/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ocis/config.md b/docs/ocis/config.md index 02df18b9f17..a07e1272578 100644 --- a/docs/ocis/config.md +++ b/docs/ocis/config.md @@ -3,7 +3,7 @@ title: "Configuration" date: "2021-11-09T00:03:16+0100" weight: 2 geekdocRepo: https://github.com/owncloud/ocis -geekdocEditPath: edit/master/ocis/templates +geekdocEditPath: edit/master/docs/ocis geekdocFilePath: config.md --- From 7f65dfba34a02be35c7c9e0dda48aadccb22c825 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:19:10 +0100 Subject: [PATCH 5/8] remove example config files --- glauth/config/example.json | 18 -- glauth/config/example.yml | 18 -- graph-explorer/config/example.json | 24 --- graph-explorer/config/example.yml | 24 --- graph/config/example.json | 18 -- graph/config/example.yml | 18 -- idp/config/example.json | 20 --- idp/config/example.yml | 19 -- idp/config/identifier-registration.yaml | 1 - ocis/config/eos-docker.env | 12 -- ocis/config/example.json | 1 - ocis/config/example.yml | 3 - ocs/config/example.json | 18 -- ocs/config/example.yml | 18 -- proxy/config/proxy-example-migration.json | 164 ------------------ proxy/config/proxy-example-regex.json | 202 ---------------------- proxy/config/proxy-example.json | 104 ----------- settings/config/example.json | 18 -- settings/config/example.yml | 18 -- storage/config/example.json | 24 --- storage/config/example.yml | 24 --- storage/config/mimetypes.json | 92 ---------- store/config/example.json | 15 -- store/config/example.yml | 15 -- thumbnails/config/example.json | 18 -- thumbnails/config/example.yml | 18 -- web/config/example.json | 24 --- web/config/example.yml | 24 --- webdav/config/example.json | 18 -- webdav/config/example.yml | 18 -- 30 files changed, 1008 deletions(-) delete mode 100644 glauth/config/example.json delete mode 100644 glauth/config/example.yml delete mode 100644 graph-explorer/config/example.json delete mode 100644 graph-explorer/config/example.yml delete mode 100644 graph/config/example.json delete mode 100644 graph/config/example.yml delete mode 100644 idp/config/example.json delete mode 100644 idp/config/example.yml delete mode 100644 idp/config/identifier-registration.yaml delete mode 100644 ocis/config/eos-docker.env delete mode 100644 ocis/config/example.json delete mode 100644 ocis/config/example.yml delete mode 100644 ocs/config/example.json delete mode 100644 ocs/config/example.yml delete mode 100644 proxy/config/proxy-example-migration.json delete mode 100644 proxy/config/proxy-example-regex.json delete mode 100644 proxy/config/proxy-example.json delete mode 100644 settings/config/example.json delete mode 100644 settings/config/example.yml delete mode 100644 storage/config/example.json delete mode 100644 storage/config/example.yml delete mode 100644 storage/config/mimetypes.json delete mode 100644 store/config/example.json delete mode 100644 store/config/example.yml delete mode 100644 thumbnails/config/example.json delete mode 100644 thumbnails/config/example.yml delete mode 100644 web/config/example.json delete mode 100644 web/config/example.yml delete mode 100644 webdav/config/example.json delete mode 100644 webdav/config/example.yml diff --git a/glauth/config/example.json b/glauth/config/example.json deleted file mode 100644 index 3685032dd32..00000000000 --- a/glauth/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9129", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9120" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "glauth" - } -} diff --git a/glauth/config/example.yml b/glauth/config/example.yml deleted file mode 100644 index 0ca0053f268..00000000000 --- a/glauth/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9129 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9120 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: glauth - -... diff --git a/graph-explorer/config/example.json b/graph-explorer/config/example.json deleted file mode 100644 index 8ef2b3443ea..00000000000 --- a/graph-explorer/config/example.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9136", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9100" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "graph-explorer" - }, - "asset": { - "path": "" - }, - "config": { - "file": "" - } -} diff --git a/graph-explorer/config/example.yml b/graph-explorer/config/example.yml deleted file mode 100644 index cf09175d94b..00000000000 --- a/graph-explorer/config/example.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9136 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9100 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: graph-explorer - -asset: - path: - -config: - file: - -... diff --git a/graph/config/example.json b/graph/config/example.json deleted file mode 100644 index 4fce8de672a..00000000000 --- a/graph/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9124", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9120" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "graph" - } -} diff --git a/graph/config/example.yml b/graph/config/example.yml deleted file mode 100644 index 3d90580ae6d..00000000000 --- a/graph/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9124 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9120 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: graph - -... diff --git a/idp/config/example.json b/idp/config/example.json deleted file mode 100644 index e70627df46d..00000000000 --- a/idp/config/example.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9134", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9130", - "root": "/", - "tls": true - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "idp" - } -} diff --git a/idp/config/example.yml b/idp/config/example.yml deleted file mode 100644 index c1a0c74a9f0..00000000000 --- a/idp/config/example.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9134 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9130 - root: / - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: idp - -... diff --git a/idp/config/identifier-registration.yaml b/idp/config/identifier-registration.yaml deleted file mode 100644 index 713d267567d..00000000000 --- a/idp/config/identifier-registration.yaml +++ /dev/null @@ -1 +0,0 @@ -# see ../assets/identifier-registration.yaml \ No newline at end of file diff --git a/ocis/config/eos-docker.env b/ocis/config/eos-docker.env deleted file mode 100644 index 62d810c9fb6..00000000000 --- a/ocis/config/eos-docker.env +++ /dev/null @@ -1,12 +0,0 @@ -EOS_MQ_URL=mq-master.testnet -EOS_MGM_ALIAS=mgm-master.testnet -EOS_QDB_NODES=quark-1.testnet:7777 quark-2.testnet:7777 quark-3.testnet:7777 -EOS_LDAP_HOST=ocis.testnet:9125 -EOS_GEOTAG=test -EOS_INSTANCE_NAME=eostest -EOS_MAIL_CC=eos@localhost -EOS_USE_QDB=1 -EOS_USE_QDB_MASTER=1 -EOS_NS_ACCOUNTING=1 -EOS_SYNCTIME_ACCOUNTING=1 -EOS_UTF8=1 diff --git a/ocis/config/example.json b/ocis/config/example.json deleted file mode 100644 index 0967ef424bc..00000000000 --- a/ocis/config/example.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/ocis/config/example.yml b/ocis/config/example.yml deleted file mode 100644 index c81cf5b7c4f..00000000000 --- a/ocis/config/example.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -... diff --git a/ocs/config/example.json b/ocs/config/example.json deleted file mode 100644 index 72b62d09d6f..00000000000 --- a/ocs/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9114", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9110" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "ocs" - } -} diff --git a/ocs/config/example.yml b/ocs/config/example.yml deleted file mode 100644 index b6bfd3b04d7..00000000000 --- a/ocs/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9114 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9110 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: ocs - -... diff --git a/proxy/config/proxy-example-migration.json b/proxy/config/proxy-example-migration.json deleted file mode 100644 index 54e05832628..00000000000 --- a/proxy/config/proxy-example-migration.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "http": { - "addr": "0.0.0.0:9200", - "root": "/" - }, - "oidc": { - "issuer": "https://localhost:9200", - "insecure": true - }, - "policy_selector": { - "migration": { - "acc_found_policy": "ocis", - "acc_not_found_policy": "oc10", - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "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": "/graph/", - "backend": "http://localhost:9120" - }, - { - "endpoint": "/app/", - "backend": "http://localhost:9140" - }, - { - "endpoint": "/archiver", - "backend": "http://localhost:9140" - }, - { - "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" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/ocs/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/remote.php/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/dav/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/webdav/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/status.php", - "backend": "https://demo.owncloud.com" - }, - { - "endpoint": "/index.php/", - "backend": "https://demo.owncloud.com" - }, - { - "endpoint": "/data", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - } - ] - } - ] -} \ No newline at end of file diff --git a/proxy/config/proxy-example-regex.json b/proxy/config/proxy-example-regex.json deleted file mode 100644 index 49f5d667448..00000000000 --- a/proxy/config/proxy-example-regex.json +++ /dev/null @@ -1,202 +0,0 @@ -{ - "http": { - "addr": "0.0.0.0:9200", - "root": "/" - }, - "oidc": { - "issuer": "https://localhost:9200", - "insecure": true - }, - "policy_selector": { - "regex": { - "selector_cookie_name": "owncloud-selector", - "default_policy": "oc10", - "matches_policies": [ - { - "priority": 10, - "property": "mail", - "match": "marie@example.org", - "policy": "ocis" - }, - { - "priority": 20, - "property": "mail", - "match": "[^@]+@example.org", - "policy": "oc10" - }, - { - "priority": 30, - "property": "username", - "match": "(einstein|feynman)", - "policy": "ocis" - }, - { - "priority": 40, - "property": "username", - "match": ".+", - "policy": "oc10" - }, - { - "priority": 50, - "property": "id", - "match": "4c510ada-c86b-4815-8820-42cdf82c3d51", - "policy": "ocis" - }, - { - "priority": 60, - "property": "id", - "match": "f7fbf8c8-139b-4376-b307-cf0a8c2d0d9c", - "policy": "oc10" - } - ], - "unauthenticated_policy": "oc10" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "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" - } - ] - }, - { - "name": "oc10", - "routes": [ - { - "endpoint": "/", - "backend": "http://localhost:9100" - }, - { - "endpoint": "/.well-known/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/konnect/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/signin/", - "backend": "http://localhost:9130" - }, - { - "endpoint": "/ocs/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/remote.php/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/dav/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/webdav/", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - }, - { - "endpoint": "/status.php", - "backend": "https://demo.owncloud.com" - }, - { - "endpoint": "/index.php/", - "backend": "https://demo.owncloud.com" - }, - { - "endpoint": "/data", - "backend": "https://demo.owncloud.com", - "apache-vhost": true - } - ] - } - ] -} \ No newline at end of file diff --git a/proxy/config/proxy-example.json b/proxy/config/proxy-example.json deleted file mode 100644 index 75f50065ee0..00000000000 --- a/proxy/config/proxy-example.json +++ /dev/null @@ -1,104 +0,0 @@ -{ - "http": { - "addr": "0.0.0.0:9200", - "root": "/" - }, - "policy_selector": { - "static": { - "policy": "ocis" - } - }, - "policies": [ - { - "name": "ocis", - "routes": [ - { - "endpoint": "/", - "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" - } - ] - } - ] -} \ No newline at end of file diff --git a/settings/config/example.json b/settings/config/example.json deleted file mode 100644 index 5591fda44fe..00000000000 --- a/settings/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9194", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9190" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "settings" - } -} diff --git a/settings/config/example.yml b/settings/config/example.yml deleted file mode 100644 index d7986c8006c..00000000000 --- a/settings/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9194 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9190 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: settings - -... diff --git a/storage/config/example.json b/storage/config/example.json deleted file mode 100644 index 8076deb52cd..00000000000 --- a/storage/config/example.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9109", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9105" - }, - "grpc": { - "addr": "0.0.0.0:9106" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "reva" - }, - "asset": { - "path": "" - } -} diff --git a/storage/config/example.yml b/storage/config/example.yml deleted file mode 100644 index 41c533d41d4..00000000000 --- a/storage/config/example.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9109 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9105 - -grpc: - addr: 0.0.0.0:9106 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: reva - -asset: - path: - -... diff --git a/storage/config/mimetypes.json b/storage/config/mimetypes.json deleted file mode 100644 index 866ae9c51af..00000000000 --- a/storage/config/mimetypes.json +++ /dev/null @@ -1,92 +0,0 @@ -[ - { - "mime_type": "application/pdf", - "extension": "pdf", - "name": "PDF", - "description": "PDF document", - "icon": "", - "default_app": "", - "allow_creation": false - }, - { - "mime_type": "application/vnd.oasis.opendocument.text", - "extension": "odt", - "name": "OpenDocument", - "description": "OpenDocument text document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.oasis.opendocument.spreadsheet", - "extension": "ods", - "name": "OpenSpreadsheet", - "description": "OpenDocument spreadsheet document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.oasis.opendocument.presentation", - "extension": "odp", - "name": "OpenPresentation", - "description": "OpenDocument presentation document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.openxmlformats-officedocument.wordprocessingml.document", - "extension": "docx", - "name": "Microsoft Word", - "description": "Microsoft Word document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", - "extension": "xlsx", - "name": "Microsoft Excel", - "description": "Microsoft Excel document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.openxmlformats-officedocument.presentationml.presentation", - "extension": "pptx", - "name": "Microsoft PowerPoint", - "description": "Microsoft PowerPoint document", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/vnd.jupyter", - "extension": "ipynb", - "name": "Jupyter Notebook", - "description": "Jupyter Notebook", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "text/markdown", - "extension": "md", - "name": "Markdown file", - "description": "Markdown file", - "icon": "", - "default_app": "", - "allow_creation": true - }, - { - "mime_type": "application/compressed-markdown", - "extension": "zmd", - "name": "Compressed markdown file", - "description": "Compressed markdown file", - "icon": "", - "default_app": "", - "allow_creation": false - } -] diff --git a/store/config/example.json b/store/config/example.json deleted file mode 100644 index 3781d6bbc36..00000000000 --- a/store/config/example.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9460", - "token": "", - "pprof": false, - "zpages": false - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "store" - } -} diff --git a/store/config/example.yml b/store/config/example.yml deleted file mode 100644 index bfd01811b8d..00000000000 --- a/store/config/example.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9460 - token: - pprof: false - zpages: false - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: store - -... diff --git a/thumbnails/config/example.json b/thumbnails/config/example.json deleted file mode 100644 index c2a6ebf9224..00000000000 --- a/thumbnails/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9189", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9110" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "thumbnails" - } -} diff --git a/thumbnails/config/example.yml b/thumbnails/config/example.yml deleted file mode 100644 index 7e1b1491a2b..00000000000 --- a/thumbnails/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9189 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9110 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: thumbnails - -... diff --git a/web/config/example.json b/web/config/example.json deleted file mode 100644 index 90bdc6fb016..00000000000 --- a/web/config/example.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9104", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9100" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "web" - }, - "asset": { - "path": "" - }, - "config": { - "file": "" - } -} diff --git a/web/config/example.yml b/web/config/example.yml deleted file mode 100644 index 986d9e9d73c..00000000000 --- a/web/config/example.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9104 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9100 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: web - -asset: - path: - -config: - file: - -... diff --git a/webdav/config/example.json b/webdav/config/example.json deleted file mode 100644 index cb9038bf286..00000000000 --- a/webdav/config/example.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "debug": { - "addr": "0.0.0.0:9119", - "token": "", - "pprof": false, - "zpages": false - }, - "http": { - "addr": "0.0.0.0:9115" - }, - "tracing": { - "enabled": false, - "type": "jaeger", - "endpoint": "localhost:6831", - "collector": "http://localhost:14268/api/traces", - "service": "webdav" - } -} diff --git a/webdav/config/example.yml b/webdav/config/example.yml deleted file mode 100644 index a02834860a5..00000000000 --- a/webdav/config/example.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -debug: - addr: 0.0.0.0:9119 - token: - pprof: false - zpages: false - -http: - addr: 0.0.0.0:9115 - -tracing: - enabled: false - type: jaeger - endpoint: localhost:6831 - collector: http://localhost:14268/api/traces - service: webdav - -... From 3d4293c7a0e2c31d2898f2a9ed3caf54ac5e5bda Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 23 Mar 2022 08:23:39 +0100 Subject: [PATCH 6/8] add changelog --- changelog/unreleased/drop-json-config-file-support.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 changelog/unreleased/drop-json-config-file-support.md diff --git a/changelog/unreleased/drop-json-config-file-support.md b/changelog/unreleased/drop-json-config-file-support.md new file mode 100644 index 00000000000..b17612a8637 --- /dev/null +++ b/changelog/unreleased/drop-json-config-file-support.md @@ -0,0 +1,7 @@ +Change: Drop json config file support + +We've remove the support to configure oCIS and it's service with a json file. +From now on we only support yaml configuration files, since they have the possibility +to add comments. + +https://github.com/owncloud/ocis/pull/3366 From 0f410479de2371a72121143ec21608624ed57518 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 28 Mar 2022 13:09:13 +0200 Subject: [PATCH 7/8] fix PROXY_OIDC_ISSUER --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index faf0739e858..dcbd0a80e60 100644 --- a/.drone.star +++ b/.drone.star @@ -1454,7 +1454,7 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on = user = "33:33" environment = { # Keycloak IDP specific configuration - "PROXY_OIDC_ISSUER": "https://keycloak/auth/realmsowncloud", + "PROXY_OIDC_ISSUER": "https://keycloak/auth/realms/owncloud", "WEB_OIDC_AUTHORITY": "https://keycloak/auth/realms/owncloud", "WEB_OIDC_CLIENT_ID": "ocis-web", "WEB_OIDC_METADATA_URL": "https://keycloak/auth/realms/owncloud/.well-known/openid-configuration", From cc7144d9d13dfd21dcc50847cdd26ef825e692f6 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 28 Mar 2022 13:13:16 +0200 Subject: [PATCH 8/8] fix config for CI parallel deployment --- .../drone/ocis/proxy.yaml | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml index 2d1a6aced43..a472adcf12c 100644 --- a/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml +++ b/tests/parallelDeployAcceptance/drone/ocis/proxy.yaml @@ -4,51 +4,51 @@ policy_selector: default_policy: oc10 unauthenticated_policy: oc10 policies: -- name: ocis - routes: - - endpoint: "/" - backend: http: //localhost:9100 - - endpoint: "/.well-known/" - backend: http: //localhost:9130 - - type: regex - endpoint: "/ocs/v[12].php/cloud/user/signing-key" - 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: "/index.php/login" - backend: http: //localhost:9100 - - endpoint: "/login" - backend: http: //localhost:9100 - - endpoint: "/data" - backend: http: //localhost:9140 - - endpoint: "/graph/" - backend: http: //localhost:9120 - - endpoint: "/app/" - backend: http: //localhost:9140 - - endpoint: "/archiver" - backend: http: //localhost:9140 - - endpoint: "/graph-explorer/" - backend: http: //localhost:9135 - - endpoint: "/api/v0/settings" - backend: http: //localhost:9190 - - endpoint: "/settings.js" - backend: http: //localhost:9190 -- name: oc10 - routes: - - endpoint: "/" - backend: http: //oc10:8080 - - endpoint: "/data" - backend: http: //localhost:9140 + - name: ocis + routes: + - endpoint: "/" + backend: http://localhost:9100 + - endpoint: "/.well-known/" + backend: http://localhost:9130 + - type: regex + endpoint: "/ocs/v[12].php/cloud/user/signing-key" + 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: "/index.php/login" + backend: http://localhost:9100 + - endpoint: "/login" + backend: http://localhost:9100 + - endpoint: "/data" + backend: http://localhost:9140 + - endpoint: "/graph/" + backend: http://localhost:9120 + - endpoint: "/app/" + backend: http://localhost:9140 + - endpoint: "/archiver" + backend: http://localhost:9140 + - endpoint: "/graph-explorer/" + backend: http://localhost:9135 + - endpoint: "/api/v0/settings" + backend: http://localhost:9190 + - endpoint: "/settings.js" + backend: http://localhost:9190 + - name: oc10 + routes: + - endpoint: "/" + backend: http://oc10:8080 + - endpoint: "/data" + backend: http://localhost:9140