Merge pull request #3690 from wkloucek/fix-deployment-examples

fix deployment examples
owncloud · May 5, 2022 · d2b0cb8 · d2b0cb8
2 parents 15f7c00 + 6e3752b
commit d2b0cb8
Show file tree

Hide file tree

Showing 40 changed files with 542 additions and 591 deletions.
diff --git a/.make/go.mk b/.make/go.mk
@@ -1,4 +1,4 @@
-OCIS_REPO := github.com/owncloud/ocis
+OCIS_REPO := github.com/owncloud/ocis/v2
 IMPORT := ($OCIS_REPO)/$(NAME)
 BIN := bin
 DIST := dist

diff --git a/deployments/continuous-deployment-config/ocis_hello/latest.yml b/deployments/continuous-deployment-config/ocis_hello/latest.yml
@@ -1,5 +1,5 @@
 ---
-- name: continuous-deployment-ocis-s3-latest
+- name: continuous-deployment-ocis-hello-latest
   server:
     server_type: cx21
     image: ubuntu-20.04
@@ -14,7 +14,7 @@
       - /var/lib/docker/volumes/ocis_certs
 
   domains:
-    - "*.ocis-s3.latest.owncloud.works"
+    - "*.ocis-hello.latest.owncloud.works"
 
   vars:
     ssh_authorized_keys:
@@ -29,21 +29,21 @@
       - name: ocis
         git_url: https://github.com/owncloud/ocis.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_s3
+        docker_compose_path: deployments/examples/ocis_hello
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OCIS_DOCKER_TAG: latest
-          OCIS_DOMAIN: ocis.ocis-s3.latest.owncloud.works
-          MINIO_DOMAIN: minio.ocis-s3.latest.owncloud.works
+          OCIS_DOMAIN: ocis.ocis-hello.latest.owncloud.works
+          DEMO_USERS: "true"
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
       - name: monitoring
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master
         env:
           NETWORK_NAME: ocis-net
-          TELEMETRY_SERVE_DOMAIN: telemetry.ocis-s3.latest.owncloud.works
+          TELEMETRY_SERVE_DOMAIN: telemetry.ocis-hello.latest.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
           TELEGRAF_SPECIFIC_CONFIG: ocis_single_container
-          OCIS_URL: ocis.ocis-s3.latest.owncloud.works
-          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-s3-latest
+          OCIS_URL: ocis.ocis-hello.latest.owncloud.works
+          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-hello-latest
diff --git a/deployments/continuous-deployment-config/ocis_individual_services/latest.yml b/deployments/continuous-deployment-config/ocis_individual_services/latest.yml
@@ -36,6 +36,7 @@
           OCIS_DOCKER_TAG: latest
           OCIS_SCALE: 6
           OCIS_DOMAIN: ocis.ocis-individual-services.latest.owncloud.works
+          DEMO_USERS: "true"
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
       - name: monitoring
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git

diff --git a/deployments/continuous-deployment-config/ocis_s3/latest.yml b/deployments/continuous-deployment-config/ocis_s3/latest.yml
@@ -1,5 +1,5 @@
 ---
-- name: continuous-deployment-ocis-hello-latest
+- name: continuous-deployment-ocis-s3-latest
   server:
     server_type: cx21
     image: ubuntu-20.04
@@ -14,7 +14,7 @@
       - /var/lib/docker/volumes/ocis_certs
 
   domains:
-    - "*.ocis-hello.latest.owncloud.works"
+    - "*.ocis-s3.latest.owncloud.works"
 
   vars:
     ssh_authorized_keys:
@@ -29,20 +29,22 @@
       - name: ocis
         git_url: https://github.com/owncloud/ocis.git
         ref: master
-        docker_compose_path: deployments/examples/ocis_hello
+        docker_compose_path: deployments/examples/ocis_s3
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: [email protected]
           OCIS_DOCKER_TAG: latest
-          OCIS_DOMAIN: ocis.ocis-hello.latest.owncloud.works
+          OCIS_DOMAIN: ocis.ocis-s3.latest.owncloud.works
+          MINIO_DOMAIN: minio.ocis-s3.latest.owncloud.works
+          DEMO_USERS: "true"
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
       - name: monitoring
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git
         ref: master
         env:
           NETWORK_NAME: ocis-net
-          TELEMETRY_SERVE_DOMAIN: telemetry.ocis-hello.latest.owncloud.works
+          TELEMETRY_SERVE_DOMAIN: telemetry.ocis-s3.latest.owncloud.works
           JAEGER_COLLECTOR: jaeger-collector.infra.owncloud.works:443
           TELEGRAF_SPECIFIC_CONFIG: ocis_single_container
-          OCIS_URL: ocis.ocis-hello.latest.owncloud.works
-          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-hello-latest
+          OCIS_URL: ocis.ocis-s3.latest.owncloud.works
+          OCIS_DEPLOYMENT_ID: continuous-deployment-ocis-s3-latest
diff --git a/deployments/continuous-deployment-config/ocis_traefik/latest.yml b/deployments/continuous-deployment-config/ocis_traefik/latest.yml
@@ -35,6 +35,7 @@
           TRAEFIK_ACME_MAIL: [email protected]
           OCIS_DOCKER_TAG: latest
           OCIS_DOMAIN: ocis.ocis-traefik.latest.owncloud.works
+          DEMO_USERS: "true"
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
       - name: monitoring
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git

diff --git a/deployments/continuous-deployment-config/ocis_traefik/released.yml b/deployments/continuous-deployment-config/ocis_traefik/released.yml
@@ -35,6 +35,7 @@
           TRAEFIK_ACME_MAIL: [email protected]
           OCIS_DOCKER_TAG: 1
           OCIS_DOMAIN: ocis.ocis-traefik.released.owncloud.works
+          DEMO_USERS: "true"
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
       - name: monitoring
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git

diff --git a/deployments/continuous-deployment-config/ocis_wopi/latest.yml b/deployments/continuous-deployment-config/ocis_wopi/latest.yml
@@ -39,6 +39,7 @@
           COLLABORA_DOMAIN: collabora.ocis-wopi.latest.owncloud.works
           ONLYOFFICE_DOMAIN: onlyoffice.ocis-wopi.latest.owncloud.works
           CODIMD_DOMAIN: codimd.ocis-wopi.latest.owncloud.works
+          DEMO_USERS: "true"
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
       - name: monitoring
         git_url: https://github.com/owncloud-devops/monitoring-tracing-client.git

diff --git a/deployments/continuous-deployment-config/ocis_wopi/released.yml b/deployments/continuous-deployment-config/ocis_wopi/released.yml
@@ -38,6 +38,7 @@
           WOPISERVER_DOMAIN: wopiserver.ocis-wopi.released.owncloud.works
           COLLABORA_DOMAIN: collabora.ocis-wopi.released.owncloud.works
           ONLYOFFICE_DOMAIN: onlyoffice.ocis-wopi.released.owncloud.works
+          DEMO_USERS: "true"
           CODIMD_DOMAIN: codimd.ocis-wopi.released.owncloud.works
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml
       - name: monitoring

diff --git a/deployments/examples/ocis_hello/.env b/deployments/examples/ocis_hello/.env
@@ -2,10 +2,6 @@
 # It skips certificate validation for various parts of oCIS and is needed if you use self signed certificates.
 INSECURE=true
 
-# The demo users should not be created on a production instance
-# because their passwords are public
-DEMO_USERS=true
-
 ### Traefik settings ###
 # Serve Traefik dashboard. Defaults to "false".
 TRAEFIK_DASHBOARD=
@@ -21,16 +17,11 @@ TRAEFIK_ACME_MAIL=
 OCIS_DOCKER_TAG=
 # Domain of oCIS, where you can find the frontend. Defaults to "ocis.owncloud.test"
 OCIS_DOMAIN=
-# IDP LDAP bind password. Must be changed in order to have a secure oCIS. Defaults to "idp".
-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=
-# JWT secret which is used for the storage provider. Must be changed in order to have a secure oCIS. Defaults to "Pive-Fumkiu4"
-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"
-STORAGE_TRANSFER_SECRET=
-# Machine auth api key secret. Must be changed in order to have a secure oCIS. Defaults to "change-me-please"
-OCIS_MACHINE_AUTH_API_KEY=
+# oCIS admin user password. Defaults to "admin".
+ADMIN_PASSWORD=
+# The demo users should not be created on a production instance
+# because their passwords are public. Defaults to "false".
+DEMO_USERS=
 
 ### oCIS Hello settings ###
 # oCIS Hello version. Defaults to "latest"

diff --git a/deployments/examples/ocis_hello/config/ocis/entrypoint-override.sh b/deployments/examples/ocis_hello/config/ocis/entrypoint-override.sh
diff --git a/deployments/examples/ocis_hello/config/ocis/proxy.yaml b/deployments/examples/ocis_hello/config/ocis/proxy.yaml
@@ -1,55 +1,151 @@
----
 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
+- name: ocis
+  routes:
+  # defaults, taken from https://owncloud.dev/extensions/proxy/configuration/
+  - type: ""
+    method: ""
+    endpoint: /
+    backend: http://localhost:9100
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /.well-known/
+    backend: http://localhost:9130
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /konnect/
+    backend: http://localhost:9130
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /signin/
+    backend: http://localhost:9130
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /archiver
+    backend: http://localhost:9140
+    service: ""
+    apache_vhost: false
+  - type: regex
+    method: ""
+    endpoint: /ocs/v[12].php/cloud/(users?|groups)
+    backend: http://localhost:9110
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /ocs/
+    backend: http://localhost:9140
+    service: ""
+    apache_vhost: false
+  - type: query
+    method: ""
+    endpoint: /remote.php/?preview=1
+    backend: http://localhost:9115
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: REPORT
+    endpoint: /remote.php/dav/
+    backend: http://localhost:9115
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /remote.php/
+    backend: ""
+    service: ocdav
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /dav/
+    backend: ""
+    service: ocdav
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /webdav/
+    backend: ""
+    service: ocdav
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /status.php
+    backend: ""
+    service: ocdav
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /index.php/
+    backend: ""
+    service: ocdav
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /apps/
+    backend: ""
+    service: ocdav
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /data
+    backend: http://localhost:9140
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /app/
+    backend: http://localhost:9140
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /graph/
+    backend: http://localhost:9120
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /graph-explorer
+    backend: http://localhost:9135
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /api/v0/accounts
+    backend: http://localhost:9181
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /accounts.js
+    backend: http://localhost:9181
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /api/v0/settings
+    backend: http://localhost:9190
+    service: ""
+    apache_vhost: false
+  - type: ""
+    method: ""
+    endpoint: /settings.js
+    backend: http://localhost:9190
+    service: ""
+    apache_vhost: false
+  # oCIS Hello specific routes
+  - endpoint: "/api/v0/greet"
+    backend: http://ocis-hello:9105
+  - endpoint: "/hello.js"
+    backend: http://ocis-hello:9105