fix single service example

deployments/continuous-deployment-config/ocis_individual_services/latest.yml

@@ -38,6 +38,19 @@
           OCIS_DOMAIN: ocis.ocis-individual-services.latest.owncloud.works
           DEMO_USERS: "true"
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
+          IDP_LDAP_BIND_PASSWORD: "elirwlketrwe53453rt"
+          STORAGE_LDAP_BIND_PASSWORD: "ekrwelkjrtlkwertjlkertkert3423"
+          OCIS_JWT_SECRET: "kdfjlkertlk234534534589345"
+          OCIS_MACHINE_AUTH_API_KEY: "rekwelkrjttwer534534-5"
+          SYSTEM_USER_API_KEY: "ekrjwelrtj235345345g,mdfglk.ert"
+          IDM_SVC_PASSWORD: "kljrhewrlkj3479734534t"
+          IDM_REVASVC_PASSWORD: "lklkjhuihir2342839i90o4dsadsd"
+          IDM_IDPSVC_PASSWORD: "jrhekr3453458734tkjert"
+          OCIS_SYSTEM_USER_ID: "d9d0f4d1-fe3c-457e-92e3-e18b3b366bbe"
+          SYSTEM_USER_ID: "3693ecf8-4164-4879-bdf3-ea3425df3c6e"
+          ADMIN_USER_ID: "09246a85-682a-4cd5-996d-8e8d2aca50af"
+          ADMIN_USER_PASSWORD: "admin"
+          PROXY_ENABLE_BASIC_AUTH: "true"
       - name: monitoring
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master

deployments/examples/oc10_ocis_parallel/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.5
+    image: traefik:v2.6.6
     networks:
       ocis-net:
         aliases:

deployments/examples/ocis_hello/docker-compose.yml

@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.5
+    image: traefik:v2.6.6
     networks:
       ocis-net:
         aliases:

deployments/examples/ocis_individual_services/.env

@@ -7,32 +7,53 @@ INSECURE=true
 DEMO_USERS=true
 
 ### Traefik settings ###
-# Serve Traefik dashboard. Defaults to "false".
-TRAEFIK_DASHBOARD=
-# Domain of Traefik, where you can find the dashboard. Defaults to "traefik.owncloud.test"
+# Serve Traefik dashboard.
+TRAEFIK_DASHBOARD=false
+# Domain of Traefik, where you can find the dashboard.
 TRAEFIK_DOMAIN=
-# Basic authentication for the dashboard. Defaults to user "admin" and password "admin"
-TRAEFIK_BASIC_AUTH_USERS=
+# Basic authentication for the dashboard.
+TRAEFIK_BASIC_AUTH_USERS=admin
 # Email address for obtaining LetsEncrypt certificates, needs only be changed if this is a public facing server
 TRAEFIK_ACME_MAIL=
 
 ### oCIS settings ###
-# oCIS version. Defaults to "latest"
-OCIS_DOCKER_TAG=
-# Domain of oCIS, where you can find the frontend. Defaults to "ocis.owncloud.test"
+# oCIS version.
+OCIS_DOCKER_TAG=latest
+# Domain of oCIS, where you can find the frontend.
 OCIS_DOMAIN=
-# IDP LDAP bind password. Must be changed in order to have a secure oCIS. Defaults to "idp".
+# IDP LDAP bind password. Must be changed in order to have a secure oCIS. Must be identical to IDP_IDPSVC_PASSWORD
 IDP_LDAP_BIND_PASSWORD=
-# Storage LDAP bind password. Must be changed in order to have a secure oCIS. Defaults to "reva".
+# Storage LDAP bind password. Must be changed in order to have a secure oCIS.
 STORAGE_LDAP_BIND_PASSWORD=
-# JWT secret which is used for the storage provider. Must be changed in order to have a secure oCIS. Defaults to "Pive-Fumkiu4"
+# JWT secret which is used for the storage provider. Must be changed in order to have a secure oCIS.
 OCIS_JWT_SECRET=
-# JWT secret which is used for uploads to create transfer tokens. Must be changed in order to have a secure oCIS. Defaults to "replace-me-with-a-transfer-secret"
+# Secret which is used for uploads to create transfer tokens. Must be changed in order to have a secure oCIS.
 STORAGE_TRANSFER_SECRET=
-# Machine auth api key secret. Must be changed in order to have a secure oCIS. Defaults to "change-me-please"
+# Secret which is used for accessing the system storage. Must be different from the OCIS_JWT_SECRET. Must be changed in order to have a secure oCIS.
+STORAGE_SYSTEM_JWT_SECRET=
+# Machine auth api key secret. Must be changed in order to have a secure oCIS.
 OCIS_MACHINE_AUTH_API_KEY=
-# Number of services to run for extensions, that currently can be easily scaled. Defaults to 1.
-OCIS_SCALE=
+# System user machine auth api key. Must be changed in order to have a secure oCIS.
+SYSTEM_USER_API_KEY=
+# Number of services to run for extensions, that currently can be easily scaled.
+OCIS_SCALE=1
+
+# IDM service user password, set to a random string.
+IDM_SVC_PASSWORD=
+# IDM Reva service user password, set to a random string.
+IDM_REVASVC_PASSWORD=
+# IDM IDP service user password, set to a random string.
+IDM_IDPSVC_PASSWORD=
+# OCIS system user id, set to a random string.
+OCIS_SYSTEM_USER_ID=
+# System user id, set to a random string.
+SYSTEM_USER_ID=
+# Admin user id, set to a random UUIDv4.
+ADMIN_USER_ID=
+# Admin user password, set to random string.
+ADMIN_USER_PASSWORD=
+# Enable basic auth for proxy, set to bool.
+PROXY_ENABLE_BASIC_AUTH=
 
 # If you want to use debugging and tracing with this stack,
 # you need uncomment following line. Please see documentation at

deployments/examples/ocis_individual_services/config/proxy/proxy.yaml

@@ -1,51 +1,59 @@
----
+
+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
+  - endpoint: /archiver
+    backend: http://frontend:9140
+  - type: regex
+    endpoint: /ocs/v[12].php/cloud/user/signing-key
+    backend: http://ocs:9110
+  - endpoint: /ocs/
+    backend: http://frontend:9140
+  - type: query
+    endpoint: /remote.php/?preview=1
+    backend: http://webdav:9115
+  - method: REPORT
+    endpoint: /remote.php/dav/
+    backend: http://webdav:9115
+  - type: query
+    endpoint: /dav/?preview=1
+    backend: http://webdav:9115
+  - type: query
+    endpoint: /webdav/?preview=1
+    backend: http://webdav:9115
+  - endpoint: /remote.php/
+    service: com.owncloud.web.ocdav
+  - endpoint: /dav/
+    service: com.owncloud.web.ocdav
+  - endpoint: /webdav/
+    service: com.owncloud.web.ocdav
+  - endpoint: /status.php
+    service: com.owncloud.web.ocdav
+  - endpoint: /index.php/
+    service: com.owncloud.web.ocdav
+  - endpoint: /apps/
+    service: com.owncloud.web.ocdav
+  - endpoint: /data
+    backend: http://frontend:9140
+  - endpoint: /app/
+    backend: http://frontend:9140
+  - endpoint: /graph/
+    backend: http://graph:9120
+  - endpoint: /graph-explorer
+    backend: http://graph-explorer:9135
+  - endpoint: /api/v0/settings
+    backend: http://settings:9190
+  - endpoint: /settings.js
+    backend: http://settings:9190
+
 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