-
Notifications
You must be signed in to change notification settings - Fork 184
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3366 from owncloud/drop-json-config-support
drop json config support
- Loading branch information
Showing
48 changed files
with
275 additions
and
1,546 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
109 changes: 0 additions & 109 deletions
109
deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json
This file was deleted.
Oops, something went wrong.
54 changes: 54 additions & 0 deletions
54
deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.