sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch deployment examples to yaml config

Browse Source
This commit is contained in:
Willy Kloucek
2022-03-28 12:54:28 +02:00
parent 551e38e21f
commit a81ba03d55
12 changed files with 211 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployments/examples/oc10_ocis_parallel/config/ocis/proxy.json
-109
View File
@@ -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"
}
]
}
]
}
deployments/examples/oc10_ocis_parallel/config/ocis/proxy.yaml
+54
View File
@@ -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
deployments/examples/oc10_ocis_parallel/docker-compose.yml
+1 -2
View File
@@ -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
deployments/examples/ocis_hello/config/ocis/proxy.json
-111
View File
@@ -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"
}
]
}
]
}
deployments/examples/ocis_hello/config/ocis/proxy.yaml
+55
View File
@@ -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
deployments/examples/ocis_hello/docker-compose.yml
+1 -1
View File
@@ -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"
deployments/examples/ocis_individual_services/config/proxy/proxy.json
-103
View File
@@ -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"
}
]
}
]
}
deployments/examples/ocis_individual_services/config/proxy/proxy.yaml
+51
View File
@@ -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
deployments/examples/ocis_individual_services/docker-compose.yml
+1 -1
View File
@@ -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"
deployments/examples/ocis_ldap/config/ocis/proxy.json
-95
View File
@@ -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"
}
]
}
]
}
deployments/examples/ocis_ldap/config/ocis/proxy.yaml
+47
View File
@@ -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
deployments/examples/ocis_ldap/docker-compose.yml
+1 -1
View File
@@ -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"