Merge branch 'master' into config-doc-descriptions

.drone.star

@@ -44,35 +44,35 @@ DEFAULT_NODEJS_VERSION = "14"
 config = {
     "modules": [
         # if you add a module here please also add it to the root level Makefile
-        "extensions/app-provider",
+        "services/app-provider",
-        "extensions/app-registry",
+        "services/app-registry",
-        "extensions/audit",
+        "services/audit",
-        "extensions/auth-basic",
+        "services/auth-basic",
-        "extensions/auth-bearer",
+        "services/auth-bearer",
-        "extensions/auth-machine",
+        "services/auth-machine",
-        "extensions/frontend",
+        "services/frontend",
-        "extensions/gateway",
+        "services/gateway",
-        "extensions/graph-explorer",
+        "services/graph-explorer",
-        "extensions/graph",
+        "services/graph",
-        "extensions/groups",
+        "services/groups",
-        "extensions/idm",
+        "services/idm",
-        "extensions/idp",
+        "services/idp",
-        "extensions/nats",
+        "services/nats",
-        "extensions/notifications",
+        "services/notifications",
-        "extensions/ocdav",
+        "services/ocdav",
-        "extensions/ocs",
+        "services/ocs",
-        "extensions/proxy",
+        "services/proxy",
-        "extensions/settings",
+        "services/settings",
-        "extensions/sharing",
+        "services/sharing",
-        "extensions/storage-system",
+        "services/storage-system",
-        "extensions/storage-publiclink",
+        "services/storage-publiclink",
-        "extensions/storage-shares",
+        "services/storage-shares",
-        "extensions/storage-users",
+        "services/storage-users",
-        "extensions/store",
+        "services/store",
-        "extensions/thumbnails",
+        "services/thumbnails",
-        "extensions/users",
+        "services/users",
-        "extensions/web",
+        "services/web",
-        "extensions/webdav",
+        "services/webdav",
         "ocis-pkg",
         "ocis",
     ],
@@ -777,7 +777,7 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                     "LOCAL_UPLOAD_DIR": "/uploads",
                     "NODE_TLS_REJECT_UNAUTHORIZED": 0,
                     "WEB_PATH": "/srv/app/web",
-                    "FEATURE_PATH": "/drone/src/extensions/settings/ui/tests/acceptance/features",
+                    "FEATURE_PATH": "/drone/src/services/settings/ui/tests/acceptance/features",
                     "MIDDLEWARE_HOST": "http://middleware:3000",
                 },
                 "commands": [
@@ -788,7 +788,7 @@ def settingsUITests(ctx, storage = "ocis", accounts_hash_difficulty = 4):
                     "git checkout $WEB_COMMITID",
                     # TODO: settings/package.json has all the acceptance test dependencies
                     # they shouldn't be needed since we could also use them from web:/tests/acceptance/package.json
-                    "cd /drone/src/extensions/settings",
+                    "cd /drone/src/services/settings",
                     "yarn install --immutable",
                     "make test-acceptance-webui",
                 ],
@@ -1640,8 +1640,8 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
             "SHARING_USER_OWNCLOUDSQL_DB_PORT": 3306,
             "SHARING_USER_OWNCLOUDSQL_DB_NAME": "owncloud",
             # General oCIS config
-            # OCIS_RUN_EXTENSIONS specifies to start all fullstack extensions except idm and idp. These are replaced by external services
+            # OCIS_RUN_SERVICES specifies to start all fullstack services except idm and idp. These are replaced by external services
-            "OCIS_RUN_EXTENSIONS": "app-registry,app-provider,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav",
+            "OCIS_RUN_SERVICES": "app-registry,app-provider,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav",
             "OCIS_LOG_LEVEL": "info",
             "OCIS_URL": OCIS_URL,
             "FRONTEND_ENABLE_RESHARING": "true",

.gitignore

@@ -1,10 +1,10 @@
 # coverage reports
 */coverage.out
-extensions/*/coverage.out
+services/*/coverage.out
 
 # unit test reports
 */checkstyle.xml
-extensions/*/checkstyle.xml
+services/*/checkstyle.xml
 
 # nodejs / yarn
 */package-lock.json
@@ -14,9 +14,9 @@ yarn.lock
 
 # build artifacts
 */bin
-extensions/*/bin
+services/*/bin
 dist/
-extensions/*/assets
+services/*/assets
 ocis/ocis
 ocis/cmd/ocis/__debug_bin
 ocis/cmd/ocis/config/
@@ -48,3 +48,6 @@ protogen/buf.sha1.lock
 
 # third-party-licenses
 /third-party-licenses
+
+# misc
+go.work

.make/docs.mk

@@ -1,6 +1,6 @@
 
 SKIP_CONFIG_DOCS_GENERATE ?= 0
-CONFIG_DOCS_BASE_PATH ?= ../../docs/extensions
+CONFIG_DOCS_BASE_PATH ?= ../../docs/services
 
 .PHONY: config-docs-generate
 config-docs-generate: #$(FLAEX)

.vscode/launch.json

@@ -21,8 +21,8 @@
                 "PROXY_ENABLE_BASIC_AUTH": "true",
                 // demo users
                 "IDM_CREATE_DEMO_USERS": "true",
-                // OCIS_RUN_EXTENSIONS allows to start a subset of extensions even in the supervised mode
+                // OCIS_RUN_SERVICES allows to start a subset of services even in the supervised mode
-                //"OCIS_RUN_EXTENSIONS": "settings,storage-system,graph,graph-explorer,idp,idm,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,storage-system,app-provider,sharing,proxy,ocdav",
+                //"OCIS_RUN_SERVICES": "settings,storage-system,graph,graph-explorer,idp,idm,ocs,store,thumbnails,web,webdav,frontend,gateway,users,groups,auth-basic,auth-bearer,storage-authmachine,storage-users,storage-shares,storage-publiclink,storage-system,app-provider,sharing,proxy,ocdav",
 
                 /*
                  * Keep secrets and passwords in one block to allow easy uncommenting

CHANGELOG.md

@@ -6,32 +6,27 @@ The following sections list the changes for unreleased.
 
 ## Summary
 
-* Enhancement - Add FRONTEND_ENABLE_RESHARING env variable: [#4023](https://github.com/owncloud/ocis/pull/4023)
+* Bugfix - CSP rules for silent token refresh in iframe: [#4031](https://github.com/owncloud/ocis/pull/4031)
-* Enhancement - Generate signing key and encryption secret: [#3909](https://github.com/owncloud/ocis/issues/3909)
+* Enhancement - Refactor extensions to services: [#3980](https://github.com/owncloud/ocis/pull/3980)
-* Enhancement - Update reva: [#4025](https://github.com/owncloud/ocis/pull/4025)
 
 ## Details
 
-* Enhancement - Add FRONTEND_ENABLE_RESHARING env variable: [#4023](https://github.com/owncloud/ocis/pull/4023)
+* Bugfix - CSP rules for silent token refresh in iframe: [#4031](https://github.com/owncloud/ocis/pull/4031)
 
-   We introduced resharing which was enabled by default, this is now configurable and can be
+   When renewing the access token silently web needs to be opened in an iframe. This was previously
-   enabled by setting the env `FRONTEND_ENABLE_RESHARING` to `true`. By default resharing is
+   blocked by a restrictive iframe CSP rule in the `Secure` middleware and has now been fixed by
-   now disabled.
+   allow `self` for iframes.
 
-   https://github.com/owncloud/ocis/pull/4023
+   https://github.com/owncloud/web/issues/7030
+   https://github.com/owncloud/ocis/pull/4031
 
-* Enhancement - Generate signing key and encryption secret: [#3909](https://github.com/owncloud/ocis/issues/3909)
+* Enhancement - Refactor extensions to services: [#3980](https://github.com/owncloud/ocis/pull/3980)
 
-   The idp service now automatically generates a signing key and encryption secret when they
+   We have decided to name all extensions, we maintain and provide with ocis, services from here on
-   don't exist. This will enable service restarts without invalidating existing sessions.
+   to avoid confusion between external extensions and code we provide and maintain.
 
-   https://github.com/owncloud/ocis/issues/3909
+   https://github.com/owncloud/ocis/pull/3980
-   https://github.com/owncloud/ocis/pull/4022
+# Changelog for [2.0.0-beta.4] (2022-06-28)
-
-* Enhancement - Update reva: [#4025](https://github.com/owncloud/ocis/pull/4025)
-
-   https://github.com/owncloud/ocis/pull/4025
-# Changelog for [2.0.0-beta.4] (2022-06-22)
 
 The following sections list the changes for 2.0.0-beta.4.
 
@@ -82,6 +77,7 @@ The following sections list the changes for 2.0.0-beta.4.
 * Change - Prevent access to disabled space: [#3779](https://github.com/owncloud/ocis/pull/3779)
 * Change - Rename serviceUser to systemUser: [#3673](https://github.com/owncloud/ocis/pull/3673)
 * Change - Split MachineAuth from SystemUser: [#3672](https://github.com/owncloud/ocis/pull/3672)
+* Enhancement - Add FRONTEND_ENABLE_RESHARING env variable: [#4023](https://github.com/owncloud/ocis/pull/4023)
 * Enhancement - Align service naming: [#3606](https://github.com/owncloud/ocis/pull/3606)
 * Enhancement - Add acting user to the audit log: [#3753](https://github.com/owncloud/ocis/issues/3753)
 * Enhancement - Add audit events for created containers: [#3941](https://github.com/owncloud/ocis/pull/3941)
@@ -92,7 +88,9 @@ The following sections list the changes for 2.0.0-beta.4.
 * Enhancement - Add config option to provide TLS certificate: [#3818](https://github.com/owncloud/ocis/issues/3818)
 * Enhancement - Add descriptions for graph-explorer config: [#3759](https://github.com/owncloud/ocis/pull/3759)
 * Enhancement - Add /me/changePassword endpoint to GraphAPI: [#3063](https://github.com/owncloud/ocis/issues/3063)
+* Enhancement - Generate signing key and encryption secret: [#3909](https://github.com/owncloud/ocis/issues/3909)
 * Enhancement - Wrap metadata storage with dedicated reva gateway: [#3602](https://github.com/owncloud/ocis/pull/3602)
+* Enhancement - New migrate command for migrating shares and public shares: [#3987](https://github.com/owncloud/ocis/pull/3987)
 * Enhancement - Product field in OCS version: [#2918](https://github.com/owncloud/ocis/pull/2918)
 * Enhancement - Allow resharing: [#3904](https://github.com/owncloud/ocis/pull/3904)
 * Enhancement - Add initial version of the search extensions: [#3635](https://github.com/owncloud/ocis/pull/3635)
@@ -102,6 +100,7 @@ The following sections list the changes for 2.0.0-beta.4.
 * Enhancement - Make thumbnails service log less noisy: [#3959](https://github.com/owncloud/ocis/pull/3959)
 * Enhancement - Update linkshare capabilities: [#3579](https://github.com/owncloud/ocis/pull/3579)
 * Enhancement - Update reva: [#3944](https://github.com/owncloud/ocis/pull/3944)
+* Enhancement - Update reva: [#4025](https://github.com/owncloud/ocis/pull/4025)
 * Enhancement - Update reva to version 2.4.1: [#3746](https://github.com/owncloud/ocis/pull/3746)
 * Enhancement - Update reva to version 2.5.1: [#3932](https://github.com/owncloud/ocis/pull/3932)
 * Enhancement - Update reva to v2.3.1: [#3552](https://github.com/owncloud/ocis/pull/3552)
@@ -465,6 +464,14 @@ The following sections list the changes for 2.0.0-beta.4.
 
    https://github.com/owncloud/ocis/pull/3672
 
+* Enhancement - Add FRONTEND_ENABLE_RESHARING env variable: [#4023](https://github.com/owncloud/ocis/pull/4023)
+
+   We introduced resharing which was enabled by default, this is now configurable and can be
+   enabled by setting the env `FRONTEND_ENABLE_RESHARING` to `true`. By default resharing is
+   now disabled.
+
+   https://github.com/owncloud/ocis/pull/4023
+
 * Enhancement - Align service naming: [#3606](https://github.com/owncloud/ocis/pull/3606)
 
    We now reflect the configured service names when listing them in the ocis runtime
@@ -541,6 +548,14 @@ The following sections list the changes for 2.0.0-beta.4.
    https://github.com/owncloud/ocis/issues/3063
    https://github.com/owncloud/ocis/pull/3705
 
+* Enhancement - Generate signing key and encryption secret: [#3909](https://github.com/owncloud/ocis/issues/3909)
+
+   The idp service now automatically generates a signing key and encryption secret when they
+   don't exist. This will enable service restarts without invalidating existing sessions.
+
+   https://github.com/owncloud/ocis/issues/3909
+   https://github.com/owncloud/ocis/pull/4022
+
 * Enhancement - Wrap metadata storage with dedicated reva gateway: [#3602](https://github.com/owncloud/ocis/pull/3602)
 
    We wrapped the metadata storage in a minimal reva instance with a dedicated gateway, including
@@ -551,6 +566,14 @@ The following sections list the changes for 2.0.0-beta.4.
    https://github.com/owncloud/ocis/pull/3602
    https://github.com/owncloud/ocis/pull/3647
 
+* Enhancement - New migrate command for migrating shares and public shares: [#3987](https://github.com/owncloud/ocis/pull/3987)
+
+   We added a new `migrate` subcommand which can be used to migrate shares and public shares
+   between different share and publicshare managers.
+
+   https://github.com/owncloud/ocis/pull/3987
+   https://github.com/owncloud/ocis/pull/4019
+
 * Enhancement - Product field in OCS version: [#2918](https://github.com/owncloud/ocis/pull/2918)
 
    We've added a new field to the OCS Version, which is supposed to announce the product name. The
@@ -619,6 +642,19 @@ The following sections list the changes for 2.0.0-beta.4.
 
 * Enhancement - Update reva: [#3944](https://github.com/owncloud/ocis/pull/3944)
 
+   Changelog for reva 2.6.1 (2022-06-27) =======================================
+
+   The following sections list the changes in reva 2.6.1 relevant to reva users. The changes are
+   ordered by importance.
+
+   Summary -------
+
+  * Bugfix [cs3org/reva#2998](https://github.com/cs3org/reva/pull/2998): Fix 0-byte-uploads
+  * Enhancement [cs3org/reva#3983](https://github.com/cs3org/reva/pull/3983): Add capability for alias links
+  * Enhancement [cs3org/reva#3000](https://github.com/cs3org/reva/pull/3000): Make less stat requests
+  * Enhancement [cs3org/reva#3003](https://github.com/cs3org/reva/pull/3003): Distinguish GRPC FAILED_PRECONDITION and ABORTED codes
+  * Enhancement [cs3org/reva#3005](https://github.com/cs3org/reva/pull/3005): Remove unused HomeMapping variable
+
    Changelog for reva 2.6.0 (2022-06-21) =======================================
 
    The following sections list the changes in reva 2.6.0 relevant to reva users. The changes are
@@ -649,6 +685,10 @@ The following sections list the changes for 2.0.0-beta.4.
    https://github.com/owncloud/ocis/pull/4000
    https://github.com/owncloud/ocis/pull/4006
 
+* Enhancement - Update reva: [#4025](https://github.com/owncloud/ocis/pull/4025)
+
+   https://github.com/owncloud/ocis/pull/4025
+
 * Enhancement - Update reva to version 2.4.1: [#3746](https://github.com/owncloud/ocis/pull/3746)
 
    Changelog for reva 2.4.1 (2022-05-24) =======================================

Makefile

@@ -16,35 +16,35 @@ L10N_MODULES := $(shell find . -path '*.tx*' -name 'config' | sed 's|/[^/]*$$||'
 
 # if you add a module here please also add it to the .drone.star file
 OCIS_MODULES = \
-	extensions/app-provider \
+	services/app-provider \
-	extensions/app-registry \
+	services/app-registry \
-	extensions/audit \
+	services/audit \
-	extensions/auth-basic \
+	services/auth-basic \
-	extensions/auth-bearer \
+	services/auth-bearer \
-	extensions/auth-machine \
+	services/auth-machine \
-	extensions/frontend \
+	services/frontend \
-	extensions/gateway \
+	services/gateway \
-	extensions/graph \
+	services/graph \
-	extensions/graph-explorer \
+	services/graph-explorer \
-	extensions/groups \
+	services/groups \
-	extensions/idm \
+	services/idm \
-	extensions/idp \
+	services/idp \
-	extensions/nats \
+	services/nats \
-	extensions/notifications \
+	services/notifications \
-	extensions/ocdav \
+	services/ocdav \
-	extensions/ocs \
+	services/ocs \
-	extensions/proxy \
+	services/proxy \
-	extensions/settings \
+	services/settings \
-	extensions/sharing \
+	services/sharing \
-	extensions/storage-system \
+	services/storage-system \
-	extensions/storage-publiclink \
+	services/storage-publiclink \
-	extensions/storage-shares \
+	services/storage-shares \
-	extensions/storage-users \
+	services/storage-users \
-	extensions/store \
+	services/store \
-	extensions/thumbnails \
+	services/thumbnails \
-	extensions/users \
+	services/users \
-	extensions/web \
+	services/web \
-	extensions/webdav\
+	services/webdav\
 	ocis \
 	ocis-pkg
 

changelog/2.0.0_2022-06-28/migrate-command.md

@@ -0,0 +1,6 @@
+Enhancement: New migrate command for migrating shares and public shares
+
+We added a new `migrate` subcommand which can be used to migrate shares and public shares between different share and publicshare managers.
+
+https://github.com/owncloud/ocis/pull/3987
+https://github.com/owncloud/ocis/pull/4019

changelog/2.0.0_2022-06-28/update-reva-beta.4.md

@@ -1,5 +1,20 @@
 Enhancement: Update reva
 
+Changelog for reva 2.6.1 (2022-06-27)
+=======================================
+
+The following sections list the changes in reva 2.6.1 relevant to
+reva users. The changes are ordered by importance.
+
+Summary
+-------
+
+* Bugfix [cs3org/reva#2998](https://github.com/cs3org/reva/pull/2998): Fix 0-byte-uploads
+* Enhancement [cs3org/reva#3983](https://github.com/cs3org/reva/pull/3983): Add capability for alias links
+* Enhancement [cs3org/reva#3000](https://github.com/cs3org/reva/pull/3000): Make less stat requests
+* Enhancement [cs3org/reva#3003](https://github.com/cs3org/reva/pull/3003): Distinguish GRPC FAILED_PRECONDITION and ABORTED codes
+* Enhancement [cs3org/reva#3005](https://github.com/cs3org/reva/pull/3005): Remove unused HomeMapping variable
+
 Changelog for reva 2.6.0 (2022-06-21)
 =======================================
 

changelog/unreleased/fix-csp-silent-refresh.md

@@ -0,0 +1,6 @@
+Bugfix: CSP rules for silent token refresh in iframe
+
+When renewing the access token silently web needs to be opened in an iframe. This was previously blocked by a restrictive iframe CSP rule in the `Secure` middleware and has now been fixed by allow `self` for iframes.
+
+https://github.com/owncloud/ocis/pull/4031
+https://github.com/owncloud/web/issues/7030

changelog/unreleased/refactor-extensions-to-services.md

@@ -0,0 +1,7 @@
+Enhancement: Refactor extensions to services
+
+We have decided to name all extensions, we maintain and provide with ocis,
+services from here on to avoid confusion between external extensions and code
+we provide and maintain.
+
+https://github.com/owncloud/ocis/pull/3980

deployments/continuous-deployment-config/ocis_keycloak/released.yml

@@ -33,7 +33,7 @@
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
-          OCIS_DOCKER_TAG: 2.0.0-beta.3
+          OCIS_DOCKER_TAG: 2.0.0-beta.4
           OCIS_DOMAIN: ocis.ocis-keycloak.released.owncloud.works
           KEYCLOAK_DOMAIN: keycloak.ocis-keycloak.released.owncloud.works
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml

deployments/continuous-deployment-config/ocis_ldap/released.yml

@@ -33,7 +33,7 @@
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
-          OCIS_DOCKER_TAG: 2.0.0-beta.3
+          OCIS_DOCKER_TAG: 2.0.0-beta.4
           OCIS_DOMAIN: ocis.ocis-ldap.released.owncloud.works
           LDAP_MANAGER_DOMAIN: ldap.ocis-ldap.released.owncloud.works
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml

deployments/continuous-deployment-config/ocis_traefik/released.yml

@@ -33,7 +33,7 @@
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
-          OCIS_DOCKER_TAG: 2.0.0-beta.3
+          OCIS_DOCKER_TAG: 2.0.0-beta.4
           OCIS_DOMAIN: ocis.ocis-traefik.released.owncloud.works
           DEMO_USERS: "true"
           COMPOSE_FILE: docker-compose.yml:monitoring_tracing/docker-compose-additions.yml

deployments/continuous-deployment-config/ocis_wopi/released.yml

@@ -33,7 +33,7 @@
         env:
           INSECURE: "false"
           TRAEFIK_ACME_MAIL: wkloucek@owncloud.com
-          OCIS_DOCKER_TAG: 2.0.0-beta.3
+          OCIS_DOCKER_TAG: 2.0.0-beta.4
           OCIS_DOMAIN: ocis.ocis-wopi.released.owncloud.works
           WOPISERVER_DOMAIN: wopiserver.ocis-wopi.released.owncloud.works
           COLLABORA_DOMAIN: collabora.ocis-wopi.released.owncloud.works

deployments/examples/oc10_ocis_parallel/docker-compose.yml

@@ -109,8 +109,8 @@ services:
       # ownCloud storage readonly
       OCIS_STORAGE_READ_ONLY: "false" # TODO: conflict with OWNCLOUDSQL -> https://github.com/owncloud/ocis/issues/2303
       # General oCIS config
-      # OCIS_RUN_EXTENSIONS specifies to start all fullstack extensions except idm and idp. These are replaced by external services
+      # OCIS_RUN_SERVICES specifies to start all fullstack services except idm and idp. These are replaced by external services
-      OCIS_RUN_EXTENSIONS: app-registry,app-provider,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav
+      OCIS_RUN_SERVICES: app-registry,app-provider,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose
       OCIS_LOG_COLOR: "${OCIS_LOG_COLOR:-false}"
       OCIS_URL: https://${CLOUD_DOMAIN:-cloud.owncloud.test}

deployments/examples/ocis_hello/config/ocis/proxy.yaml

@@ -5,7 +5,7 @@ policy_selector:
 policies:
   - name: ocis
     routes:
-      # defaults, taken from https://owncloud.dev/extensions/proxy/configuration/
+      # defaults, taken from https://owncloud.dev/services/proxy/configuration/
       - endpoint: /
         backend: http://localhost:9100
       - endpoint: /.well-known/

deployments/examples/ocis_keycloak/docker-compose.yml

@@ -66,6 +66,7 @@ services:
       # INSECURE: needed if oCIS / Traefik is using self generated certificates
       OCIS_INSECURE: "${INSECURE:-false}"
     volumes:
+      - ocis-config:/etc/ocis
       - ocis-data:/var/lib/ocis
     labels:
       - "traefik.enable=true"
@@ -137,6 +138,7 @@ services:
 
 volumes:
   certs:
+  ocis-config:
   ocis-data:
   keycloak_postgres_data:
 

deployments/examples/ocis_ldap/docker-compose.yml

@@ -72,8 +72,8 @@ services:
       IDP_LDAP_UUID_ATTRIBUTE: "ownclouduuid"
       IDP_LDAP_UUID_ATTRIBUTE_TYPE: binary
       GRAPH_LDAP_SERVER_WRITE_ENABLED: "false" # assuming the external ldap is readonly
-      # OCIS_RUN_EXTENSIONS specifies to start all extensions except glauth, idm and accounts. These are replaced by external services
+      # OCIS_RUN_SERVICES specifies to start all services except glauth, idm and accounts. These are replaced by external services
-      OCIS_RUN_EXTENSIONS: app-registry,app-provider,audit,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,idp,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav
+      OCIS_RUN_SERVICES: app-registry,app-provider,audit,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,idp,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav
       # General oCIS config
       OCIS_URL: https://${OCIS_DOMAIN:-ocis.owncloud.test}
       OCIS_LOG_LEVEL: ${OCIS_LOG_LEVEL:-error} # make oCIS less verbose

deployments/examples/ocis_wopi/.env

@@ -25,7 +25,7 @@ DEMO_USERS=
 
 ### Wopi server settings ###
 # cs3org wopi server version. Defaults to "latest"
-WOPISERVER_DOCKER_TAG=
+WOPISERVER_DOCKER_TAG=v8.3.0
 # cs3org wopi server domain. Defaults to "wopiserver.owncloud.test"
 WOPISERVER_DOMAIN=
 # JWT secret which is used for the documents to be request by the Wopi client from the cs3org Wopi server. Must be change in order to have a secure Wopi server. Defaults to "LoremIpsum567"

docs/Makefile

@@ -7,7 +7,7 @@ help:
 	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 
 .PHONY: docs-generate
-docs-generate: ## run docs-generate for all oCIS extensions
+docs-generate: ## run docs-generate for all oCIS services
 	@pushd helpers && go run configenvextractor.go; popd
 	@$(MAKE) --no-print-directory -C ../ docs-generate
 

docs/extensions/gateway/configuration.md

@@ -1,15 +0,0 @@
----
-title: Service Configuration
-date: 2018-05-02T00:00:00+00:00
-weight: 20
-geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/gateway
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/gateway-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/gateway_configvars.md" >}}

docs/extensions/graph-explorer/configuration.md

@@ -1,15 +0,0 @@
----
-title: Service Configuration
-date: 2018-05-02T00:00:00+00:00
-weight: 20
-geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/graph-explorer
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/graph-explorer-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/graph-explorer_configvars.md" >}}

docs/extensions/graph/configuration.md

@@ -1,14 +0,0 @@
----
-title: Service Configuration
-date: 2018-05-02T00:00:00+00:00
-weight: 20
-geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/graph
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-## Example YAML Config
-
-{{< include file="extensions/_includes/graph-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/graph_configvars.md" >}}

docs/extensions/groups/configuration.md

@@ -1,15 +0,0 @@
----
-title: Service Configuration
-date: 2018-05-02T00:00:00+00:00
-weight: 20
-geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/groups
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/groups-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/groups_configvars.md" >}}

docs/extensions/notifications/configuration.md

@@ -1,15 +0,0 @@
----
-title: Service Configuration
-date: 2018-05-02T00:00:00+00:00
-weight: 20
-geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/notifications
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/notifications-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/notifications_configvars.md" >}}

docs/extensions/proxy/configuration.md

@@ -1,15 +0,0 @@
----
-title: Service Configuration
-date: 2018-05-02T00:00:00+00:00
-weight: 20
-geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/proxy
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/proxy-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/proxy_configvars.md" >}}

docs/extensions/sharing/configuration.md

@@ -1,15 +0,0 @@
----
-title: Service Configuration
-date: 2018-05-02T00:00:00+00:00
-weight: 20
-geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/sharing
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/sharing-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/sharing_configvars.md" >}}