mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 04:09:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2624 from owncloud/configuration_streamlining

Browse Source 
[deployment-examples] streamline configuration
This commit is contained in:
Willy Kloucek
2021-10-18 09:48:43 +02:00
committed by GitHub
parent 9443f2f50a de3fefd4dd
commit 669175b062
7 changed files with 63 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy/config/proxy-example-migration.json
View File

@@ -76,6 +76,10 @@
"endpoint": "/graph/",
"backend": "http://localhost:9120"
},
{
"endpoint": "/app/",
"backend": "http://localhost:9140"
},
{
"endpoint": "/graph-explorer/",
"backend": "http://localhost:9135"

46
proxy/config/proxy-example-regex.json
View File

@@ -12,12 +12,42 @@
"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"}
{
"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"
}
@@ -80,6 +110,10 @@
"endpoint": "/data",
"backend": "http://localhost:9140"
},
{
"endpoint": "/app/",
"backend": "http://localhost:9140"
},
{
"endpoint": "/graph/",
"backend": "http://localhost:9120"

4
proxy/config/proxy-example.json
View File

@@ -66,6 +66,10 @@
"endpoint": "/data",
"backend": "http://localhost:9140"
},
{
"endpoint": "/app/",
"backend": "http://localhost:9140"
},
{
"endpoint": "/graph/",
"backend": "http://localhost:9120"

8
proxy/pkg/proxy/proxy.go
View File

@@ -299,10 +299,6 @@ func defaultPolicies() []config.Policy {
Endpoint: "/ocs/v[12].php/cloud/(users?|groups)", // we have `user`, `users` and `groups` in ocis-ocs
Backend: "http://localhost:9110",
},
{
Endpoint: "/app/",
Backend: "http://localhost:9140",
},
{
Endpoint: "/ocs/",
Backend: "http://localhost:9140",
@@ -336,6 +332,10 @@ func defaultPolicies() []config.Policy {
Endpoint: "/data",
Backend: "http://localhost:9140",
},
{
Endpoint: "/app/",
Backend: "http://localhost:9140",
},
{
Endpoint: "/graph/",
Backend: "http://localhost:9120",