Merge branch 'master' into search

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>

docs/.gitignore

@@ -1,3 +1,4 @@
 hugo/
 grpc_apis/
 mutagen.yml.lock
+helpers/output/*

docs/extensions/idm/setup.md

@@ -29,7 +29,8 @@ export LDAP_USER_OBJECTCLASS="inetOrgPerson"
 export LDAP_GROUP_BASE_DN="ou=groups,o=libregraph-idm"
 export LDAP_GROUP_SCHEMA_ID="ownclouduuid"
 export LDAP_GROUP_SCHEMA_MAIL="mail"
-export LDAP_GROUP_SCHEMA_GROUPNAME="member"
+export LDAP_GROUP_SCHEMA_GROUPNAME="cn"
+export LDAP_GROUP_SCHEMA_MEMBER="member"
 export LDAP_GROUP_OBJECTCLASS="groupOfNames"
 export GRAPH_LDAP_BIND_DN="uid=libregraph,ou=sysusers,o=libregraph-idm"
 export GRAPH_LDAP_BIND_PASSWORD=idm

docs/helpers/configenvextractor.go

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

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

@@ -15,7 +15,7 @@ import (
 
 func main() {
 	replacer := strings.NewReplacer(
-		"github.com/owncloud/ocis/", "",
+		"github.com/owncloud/ocis/extensions/", "",
 		"/pkg/config/defaults", "",
 	)
 	cfg := map[string]string{

docs/helpers/extractor.go.tmpl

@@ -28,7 +28,7 @@ if err != nil {
     log.Fatal(err)
 }
 replacer := strings.NewReplacer(
-		"github.com/owncloud/ocis/", "",
+		"github.com/owncloud/ocis/extensions/", "",
 		"/pkg/config/defaults", "",
 	)
 var fields []ConfigField