Merge pull request #3980 from owncloud/rename-extensions-to-services

Refactor extensions to services.

.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",
-        "extensions/app-registry",
-        "extensions/audit",
-        "extensions/auth-basic",
-        "extensions/auth-bearer",
-        "extensions/auth-machine",
-        "extensions/frontend",
-        "extensions/gateway",
-        "extensions/graph-explorer",
-        "extensions/graph",
-        "extensions/groups",
-        "extensions/idm",
-        "extensions/idp",
-        "extensions/nats",
-        "extensions/notifications",
-        "extensions/ocdav",
-        "extensions/ocs",
-        "extensions/proxy",
-        "extensions/settings",
-        "extensions/sharing",
-        "extensions/storage-system",
-        "extensions/storage-publiclink",
-        "extensions/storage-shares",
-        "extensions/storage-users",
-        "extensions/store",
-        "extensions/thumbnails",
-        "extensions/users",
-        "extensions/web",
-        "extensions/webdav",
+        "services/app-provider",
+        "services/app-registry",
+        "services/audit",
+        "services/auth-basic",
+        "services/auth-bearer",
+        "services/auth-machine",
+        "services/frontend",
+        "services/gateway",
+        "services/graph-explorer",
+        "services/graph",
+        "services/groups",
+        "services/idm",
+        "services/idp",
+        "services/nats",
+        "services/notifications",
+        "services/ocdav",
+        "services/ocs",
+        "services/proxy",
+        "services/settings",
+        "services/sharing",
+        "services/storage-system",
+        "services/storage-publiclink",
+        "services/storage-shares",
+        "services/storage-users",
+        "services/store",
+        "services/thumbnails",
+        "services/users",
+        "services/web",
+        "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_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 specifies to start all fullstack services except idm and idp. These are replaced by external services
+            "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/

.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_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 allows to start a subset of services even in the supervised mode
+                //"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

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 \
-	extensions/app-registry \
-	extensions/audit \
-	extensions/auth-basic \
-	extensions/auth-bearer \
-	extensions/auth-machine \
-	extensions/frontend \
-	extensions/gateway \
-	extensions/graph \
-	extensions/graph-explorer \
-	extensions/groups \
-	extensions/idm \
-	extensions/idp \
-	extensions/nats \
-	extensions/notifications \
-	extensions/ocdav \
-	extensions/ocs \
-	extensions/proxy \
-	extensions/settings \
-	extensions/sharing \
-	extensions/storage-system \
-	extensions/storage-publiclink \
-	extensions/storage-shares \
-	extensions/storage-users \
-	extensions/store \
-	extensions/thumbnails \
-	extensions/users \
-	extensions/web \
-	extensions/webdav\
+	services/app-provider \
+	services/app-registry \
+	services/audit \
+	services/auth-basic \
+	services/auth-bearer \
+	services/auth-machine \
+	services/frontend \
+	services/gateway \
+	services/graph \
+	services/graph-explorer \
+	services/groups \
+	services/idm \
+	services/idp \
+	services/nats \
+	services/notifications \
+	services/ocdav \
+	services/ocs \
+	services/proxy \
+	services/settings \
+	services/sharing \
+	services/storage-system \
+	services/storage-publiclink \
+	services/storage-shares \
+	services/storage-users \
+	services/store \
+	services/thumbnails \
+	services/users \
+	services/web \
+	services/webdav\
 	ocis \
 	ocis-pkg
 

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/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_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 specifies to start all fullstack services except idm and idp. These are replaced by external services
+      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_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_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 specifies to start all services except glauth, idm and accounts. These are replaced by external services
+      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

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" >}}

docs/extensions/storage-publiclink/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/storage-publiclink
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/storage-publiclink-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/storage-publiclink_configvars.md" >}}

docs/extensions/storage-shares/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/storage-shares
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/storage-shares-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/storage-shares_configvars.md" >}}

docs/extensions/storage-system/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/storage-system
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/storage-system-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/storage-system_configvars.md" >}}

docs/extensions/storage-users/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/storage-users
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/storage-users-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/storage-users_configvars.md" >}}

docs/extensions/store/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/store
-geekdocFilePath: configuration.md
-geekdocCollapseSection: true
----
-
-## Example YAML Config
-
-{{< include file="extensions/_includes/store-config-example.yaml"  language="yaml" >}}
-
-{{< include file="extensions/_includes/store_configvars.md" >}}

docs/helpers/adoc-generator.go.tmpl

@@ -35,7 +35,7 @@ if err != nil {
     log.Fatal(err)
 }
 replacer := strings.NewReplacer(
-		"github.com/owncloud/ocis/v2/extensions/", "",
+		"github.com/owncloud/ocis/v2/services/", "",
 		"/pkg/config/defaults", "",
 	)
 var fields []ConfigField
@@ -48,7 +48,7 @@ m := map[string]interface{}{
 {{- end }}
 }
 
-    targetFolder := "../../docs/extensions/_includes/adoc/"
+    targetFolder := "../../docs/services/_includes/adoc/"
     for pkg, conf := range m {
 	fields = GetAnnotatedVariables(conf)
 	if len(fields) > 0 {

docs/helpers/configenvextractor.go

@@ -20,7 +20,7 @@ var targets = map[string]string{
 
 func main() {
 	fmt.Println("Getting relevant packages")
-	paths, err := filepath.Glob("../../extensions/*/pkg/config/defaults/defaultconfig.go")
+	paths, err := filepath.Glob("../../services/*/pkg/config/defaults/defaultconfig.go")
 	if err != nil {
 		log.Fatal(err)
 	}

docs/helpers/environment-variable-docs-generator.go.tmpl

@@ -29,7 +29,7 @@ if err != nil {
     log.Fatal(err)
 }
 replacer := strings.NewReplacer(
-		"github.com/owncloud/ocis/v2/extensions/", "",
+		"github.com/owncloud/ocis/v2/services/", "",
 		"/pkg/config/defaults", "",
 	)
 var fields []ConfigField
@@ -42,7 +42,7 @@ m := map[string]interface{}{
 {{- end }}
 }
 
-    targetFolder := "../../docs/extensions/_includes/"
+    targetFolder := "../../docs/services/_includes/"
     for pkg, conf := range m {
 	fields = GetAnnotatedVariables(conf)
 	if len(fields) > 0 {

docs/helpers/example-config-generator.go.tmpl

@@ -15,7 +15,7 @@ import (
 
 func main() {
 	replacer := strings.NewReplacer(
-		"github.com/owncloud/ocis/v2/extensions/", "",
+		"github.com/owncloud/ocis/v2/services/", "",
 		"/pkg/config/defaults", "",
 	)
 	cfg := map[string]string{
@@ -35,7 +35,7 @@ func main() {
 		targetFolders := []string{
 			// TODO: comment in when it is clear how to commit this to the structure of the master|main branch
 			// filepath.Join("../../", pkg, "/config"),
-			"../../docs/extensions/_includes/",
+			"../../docs/services/_includes/",
 		}
 		for _, targetFolder := range targetFolders {
 			os.MkdirAll(targetFolder, 0700)

docs/ocis/deployment/ocis_individual_services.md

@@ -19,7 +19,7 @@ geekdocFilePath: ocis_individual_services.md
 
 The docker stack consists of at least 24 containers. One of them is Traefik, a proxy which is terminating ssl and forwards the requests to oCIS in the internal docker network.
 
-The other containers are oCIS extensions, running each one in a separate container. In this example, oCIS uses its internal IDP [LibreGraph Connect]({{< ref "../../extensions/idp" >}}) and the [oCIS storage driver]({{< ref "../storage/storagedrivers" >}}). You also can start more than one container of each service by setting `OCIS_SCALE` to a number greater than 1. Currently this won't scale all services, but we are working on making all service easily scalable.
+The other containers are oCIS services, running each one in a separate container. In this example, oCIS uses its internal IDP [LibreGraph Connect]({{< ref "../../services/idp" >}}) and the [oCIS storage driver]({{< ref "../storage/storagedrivers" >}}). You also can start more than one container of each service by setting `OCIS_SCALE` to a number greater than 1. Currently this won't scale all services, but we are working on making all service easily scalable.
 
 ## Server Deployment
 
@@ -76,7 +76,7 @@ See also [example server setup]({{< ref "preparing_server" >}})
   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=
-  # Number of services to run for extensions, that currently can be easily scaled. Defaults to 1.
+  # Number of services to run for services, that currently can be easily scaled. Defaults to 1.
   OCIS_SCALE=
   ```
 

docs/ocis/deployment/ocis_keycloak.md

@@ -20,9 +20,9 @@ geekdocFilePath: ocis_keycloak.md
 The docker stack consists 4 containers. One of them is Traefik, a proxy which is terminating ssl and forwards the requests to oCIS in the internal docker network. It
 is also responsible for redirecting requests on the OIDC discovery endpoints (e.g. `.well-known/openid-configuration`) to the correct destination in Keycloak.
 
-Keycloak add two containers: Keycloak itself and a PostgreSQL as database. Keycloak will be configured as oCIS' IDP instead of the internal IDP [LibreGraph Connect]({{< ref "../../extensions/idp" >}})
+Keycloak add two containers: Keycloak itself and a PostgreSQL as database. Keycloak will be configured as oCIS' IDP instead of the internal IDP [LibreGraph Connect]({{< ref "../../services/idp" >}})
 
-The other container is oCIS itself, running all extensions in one container. In this example oCIS uses the [oCIS storage driver]({{< ref "../storage/storagedrivers" >}})
+The other container is oCIS itself, running all services in one container. In this example oCIS uses the [oCIS storage driver]({{< ref "../storage/storagedrivers" >}})
 
 ## Server Deployment
 

docs/ocis/deployment/ocis_traefik.md

@@ -18,7 +18,7 @@ geekdocFilePath: ocis_traefik.md
 
 The docker stack consists of two containers. One of them is Traefik, a proxy which is terminating ssl and forwards the requests to oCIS in the internal docker network.
 
-The other one is oCIS itself running all extensions in one container. In this example, oCIS uses its internal IDP [LibreGraph Connect]({{< ref "../../extensions/idp" >}}) and the [oCIS storage driver]({{< ref "../storage/storagedrivers" >}})
+The other one is oCIS itself running all extensions in one container. In this example, oCIS uses its internal IDP [LibreGraph Connect]({{< ref "../../services/idp" >}}) and the [oCIS storage driver]({{< ref "../storage/storagedrivers" >}})
 
 ## Server Deployment
 

docs/ocis/development/extensions.md

@@ -46,7 +46,7 @@ For a consistent look and feel, ownCloud Web uses an external design library, th
 
 ### Settings
 
-An extension likely has some behaviour which the user can configure. Fundamental configuration will often be done by administrators during deployment, via configuration files or by setting environment variables. But for other settings, which are supposed to change more often or which are even user specific, this is not a viable way. Therefore you need to offer the users a UI where they can configure your extension to their liking. Because implementing something like this is a repetitive task among extensions, oCIS already offers the settings extensions which does that for your extension. Your extension just needs to register settings bundles, respective permissions and finally read the current values from the settings service. You can read more on that on the [settings extension]({{< ref "../../extensions/settings" >}}) and see how [oCIS Hello uses these settings](https://owncloud.dev/extensions/ocis_hello/settings/).
+An extension likely has some behaviour which the user can configure. Fundamental configuration will often be done by administrators during deployment, via configuration files or by setting environment variables. But for other settings, which are supposed to change more often or which are even user specific, this is not a viable way. Therefore you need to offer the users a UI where they can configure your extension to their liking. Because implementing something like this is a repetitive task among extensions, oCIS already offers the settings extensions which does that for your extension. Your extension just needs to register settings bundles, respective permissions and finally read the current values from the settings service. You can read more on that on the [settings extension]({{< ref "../../services/settings" >}}) and see how [oCIS Hello uses these settings](https://owncloud.dev/extensions/ocis_hello/settings/).
 
 ### Proxy
 

docs/services/app-provider/_index.md

@@ -3,7 +3,7 @@ title: App-Provider
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/app-provider
+geekdocEditPath: edit/master/docs/services/app-provider
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/app-provider/configuration.md

@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/auth-basic
+geekdocEditPath: edit/master/docs/services/app-provider
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/auth-basic-config-example.yaml"  language="yaml" >}}
+{{< include file="services/_includes/app-provider-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/auth-basic_configvars.md" >}}
+{{< include file="services/_includes/app-provider_configvars.md" >}}

docs/services/app-registry/_index.md

@@ -3,7 +3,7 @@ title: App-Registry
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/app-registry
+geekdocEditPath: edit/master/docs/services/app-registry
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/app-registry/apps.md

@@ -3,7 +3,7 @@ title: "Apps"
 date: 2018-05-02T00:00:00+00:00
 weight: 10
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/app-registry
+geekdocEditPath: edit/master/docs/services/app-registry
 geekdocFilePath: apps.md
 ---
 

docs/services/app-registry/configuration.md

@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/thumbnails
+geekdocEditPath: edit/master/docs/services/app-registry
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/thumbnails-config-example.yaml"  language="yaml" >}}
+{{< include file="services/_includes/app-registry-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/thumbnails_configvars.md" >}}
+{{< include file="services/_includes/app-registry_configvars.md" >}}

docs/services/audit/_index.md

@@ -3,7 +3,7 @@ title: Audit
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/audit
+geekdocEditPath: edit/master/docs/services/audit
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/audit/configuration.md

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

docs/services/auth-basic/_index.md

@@ -3,7 +3,7 @@ title: Auth-Basic
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/auth-basic
+geekdocEditPath: edit/master/docs/services/auth-basic
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/auth-basic/configuration.md

@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/frontend
+geekdocEditPath: edit/master/docs/services/auth-basic
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/frontend-config-example.yaml"  language="yaml" >}}
+{{< include file="services/_includes/auth-basic-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/frontend_configvars.md" >}}
+{{< include file="services/_includes/auth-basic_configvars.md" >}}

docs/services/auth-bearer/_index.md

@@ -3,7 +3,7 @@ title: Auth-Bearer
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/auth-bearer
+geekdocEditPath: edit/master/docs/services/auth-bearer
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/auth-bearer/configuration.md

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

docs/services/auth-machine/_index.md

@@ -3,7 +3,7 @@ title: Auth-Machine
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/auth-machine
+geekdocEditPath: edit/master/docs/services/auth-machine
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/auth-machine/configuration.md

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

docs/services/frontend/_index.md

@@ -3,7 +3,7 @@ title: Frontend
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/frontend
+geekdocEditPath: edit/master/docs/services/frontend
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/frontend/configuration.md

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

docs/services/gateway/_index.md

@@ -3,7 +3,7 @@ title: Gateway
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/gateway
+geekdocEditPath: edit/master/docs/services/gateway
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/gateway/configuration.md

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

docs/services/graph-explorer/_index.md

@@ -3,7 +3,7 @@ title: "Graph-Explorer"
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/graph-explorer
+geekdocEditPath: edit/master/docs/services/graph-explorer
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/graph-explorer/configuration.md

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

docs/services/graph/_index.md

@@ -3,7 +3,7 @@ title: "Graph"
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/graph
+geekdocEditPath: edit/master/docs/services/graph
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/graph/configuration.md

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

docs/services/graph/groups.md

@@ -2,7 +2,7 @@
 title: Groups
 weight: 40
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/graph
+geekdocEditPath: edit/master/docs/services/graph
 geekdocFilePath: users.md
 ---
 

docs/services/graph/spaces.md

@@ -2,7 +2,7 @@
 title: Spaces
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/graph
+geekdocEditPath: edit/master/docs/services/graph
 geekdocFilePath: spaces.md
 ---
 

docs/services/graph/users.md

@@ -2,7 +2,7 @@
 title: Users
 weight: 30
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/graph
+geekdocEditPath: edit/master/docs/services/graph
 geekdocFilePath: users.md
 ---
 

docs/services/groups/_index.md

@@ -3,7 +3,7 @@ title: Groups
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/groups
+geekdocEditPath: edit/master/docs/services/groups
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/groups/configuration.md

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

docs/services/idm/_index.md

@@ -3,7 +3,7 @@ title: IDM
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/idm
+geekdocEditPath: edit/master/docs/services/idm
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/idm/configuration.md

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

docs/services/idm/configuration_hints.md

@@ -3,7 +3,7 @@ title: Configuration Hints
 date: 2022-04-27:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/idm
+geekdocEditPath: edit/master/docs/services/idm
 geekdocFilePath: configuration_hints.md
 geekdocCollapseSection: true
 ---

docs/services/idp/_index.md

@@ -2,7 +2,7 @@
 title: IDP
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/idp
+geekdocEditPath: edit/master/docs/services/idp
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/idp/configuration.md

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

docs/services/idp/theming.md

@@ -2,7 +2,7 @@
 title: Theming
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/theming
+geekdocEditPath: edit/master/docs/services/theming
 geekdocFilePath: theming.md
 ---
 

docs/services/nats/_index.md

@@ -3,7 +3,7 @@ title: NATS
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/nats
+geekdocEditPath: edit/master/docs/services/nats
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/nats/configuration.md

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

docs/services/notifications/_index.md

@@ -3,7 +3,7 @@ title: Notifications
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/notifications
+geekdocEditPath: edit/master/docs/services/notifications
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/notifications/configuration.md

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

docs/services/ocdav/_index.md

@@ -3,7 +3,7 @@ title: ocDAV
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/ocdav
+geekdocEditPath: edit/master/docs/services/ocdav
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/ocdav/configuration.md

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

docs/services/ocs/_index.md

@@ -3,7 +3,7 @@ title: "Ocs"
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/ocs
+geekdocEditPath: edit/master/docs/services/ocs
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/ocs/configuration.md

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

docs/services/proxy/_index.md

@@ -2,7 +2,7 @@
 title: Proxy
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/proxy
+geekdocEditPath: edit/master/docs/services/proxy
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/proxy/configuration.md

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

docs/services/search/_index.md

@@ -2,7 +2,7 @@
 title: Search
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/search
+geekdocEditPath: edit/master/docs/services/search
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/search/configuration.md

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

docs/services/settings/_index.md

@@ -3,7 +3,7 @@ title: "Settings"
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/settings
+geekdocEditPath: edit/master/docs/services/settings
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/settings/bundles.md

@@ -3,7 +3,7 @@ title: "Settings Bundles"
 date: 2020-05-04T00:00:00+00:00
 weight: 50
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/settings
+geekdocEditPath: edit/master/docs/services/settings
 geekdocFilePath: bundles.md
 ---
 

docs/services/settings/configuration.md

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

docs/services/settings/glossary.md

@@ -3,7 +3,7 @@ title: "Glossary"
 date: 2020-05-04T12:35:00+01:00
 weight: 80
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/settings
+geekdocEditPath: edit/master/docs/services/settings
 geekdocFilePath: glossary.md
 ---
 

docs/services/settings/releasing.md

@@ -2,7 +2,7 @@
 title: "Releasing"
 weight: 70
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/settings
+geekdocEditPath: edit/master/docs/services/settings
 geekdocFilePath: releasing.md
 ---
 

docs/services/settings/tests.md

@@ -2,7 +2,7 @@
 title: "Tests"
 weight: 90
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/settings
+geekdocEditPath: edit/master/docs/services/settings
 geekdocFilePath: tests.md
 ---
 

docs/services/settings/values.md

@@ -3,7 +3,7 @@ title: "Settings Values"
 date: 2020-05-04T00:00:00+00:00
 weight: 51
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/settings
+geekdocEditPath: edit/master/docs/services/settings
 geekdocFilePath: values.md
 ---
 

docs/services/sharing/_index.md

@@ -2,7 +2,7 @@
 title: Sharing
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/sharing
+geekdocEditPath: edit/master/docs/services/sharing
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/sharing/configuration.md

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

docs/services/storage-publiclink/_index.md

@@ -3,7 +3,7 @@ title: Storage-Publiclink
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/storage-publiclink
+geekdocEditPath: edit/master/docs/services/storage-publiclink
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/storage-publiclink/configuration.md

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

docs/services/storage-shares/_index.md

@@ -3,7 +3,7 @@ title: Storage-Shares
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/storage-shares
+geekdocEditPath: edit/master/docs/services/storage-shares
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/storage-shares/configuration.md

@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/auth-machine
+geekdocEditPath: edit/master/docs/services/storage-shares
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/auth-machine-config-example.yaml"  language="yaml" >}}
+{{< include file="services/_includes/storage-shares-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/auth-machine_configvars.md" >}}
+{{< include file="services/_includes/storage-shares_configvars.md" >}}

docs/services/storage-system/_index.md

@@ -3,7 +3,7 @@ title: Storage-System
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/storage-system
+geekdocEditPath: edit/master/docs/services/storage-system
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---

docs/services/storage-system/configuration.md

@@ -3,13 +3,13 @@ title: Service Configuration
 date: 2018-05-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/app-provider
+geekdocEditPath: edit/master/docs/services/storage-system
 geekdocFilePath: configuration.md
 geekdocCollapseSection: true
 ---
 
 ## Example YAML Config
 
-{{< include file="extensions/_includes/app-provider-config-example.yaml"  language="yaml" >}}
+{{< include file="services/_includes/storage-system-config-example.yaml"  language="yaml" >}}
 
-{{< include file="extensions/_includes/app-provider_configvars.md" >}}
+{{< include file="services/_includes/storage-system_configvars.md" >}}

docs/services/storage-users/_index.md

@@ -3,7 +3,7 @@ title: Storage-Users
 date: 2022-03-02T00:00:00+00:00
 weight: 20
 geekdocRepo: https://github.com/owncloud/ocis
-geekdocEditPath: edit/master/docs/extensions/storage-users
+geekdocEditPath: edit/master/docs/services/storage-users
 geekdocFilePath: _index.md
 geekdocCollapseSection: true
 ---