From 90424831d34e051d3b080c1ec51fcc356f211049 Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhaferkamp@owncloud.com>
Date: Wed, 16 Mar 2022 15:09:12 +0100
Subject: [PATCH] Fix default config for idm

It seems some defaults got lost when moving default to defaults/defaultconfig.go
---
 idm/pkg/config/defaultconfig.go          | 27 ------------------------
 idm/pkg/config/defaults/defaultconfig.go |  6 ++++++
 2 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 idm/pkg/config/defaultconfig.go

diff --git a/idm/pkg/config/defaultconfig.go b/idm/pkg/config/defaultconfig.go
deleted file mode 100644
index b82869425f0..00000000000
--- a/idm/pkg/config/defaultconfig.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package config
-
-import (
-	"path"
-
-	"github.com/owncloud/ocis/ocis-pkg/config/defaults"
-)
-
-func DefaultConfig() *Config {
-	return &Config{
-		Service: Service{
-			Name: "idm",
-		},
-		CreateDemoUsers: true,
-		ServiceUserPasswords: ServiceUserPasswords{
-			IdmAdmin: "idm",
-			Idp:      "idp",
-			Reva:     "reva",
-		},
-		IDM: Settings{
-			LDAPSAddr:    "127.0.0.1:9235",
-			Cert:         path.Join(defaults.BaseDataPath(), "idm", "ldap.crt"),
-			Key:          path.Join(defaults.BaseDataPath(), "idm", "ldap.key"),
-			DatabasePath: path.Join(defaults.BaseDataPath(), "idm", "ocis.boltdb"),
-		},
-	}
-}
diff --git a/idm/pkg/config/defaults/defaultconfig.go b/idm/pkg/config/defaults/defaultconfig.go
index b1042376aa3..83e1bcfee66 100644
--- a/idm/pkg/config/defaults/defaultconfig.go
+++ b/idm/pkg/config/defaults/defaultconfig.go
@@ -21,6 +21,12 @@ func DefaultConfig() *config.Config {
 		Service: config.Service{
 			Name: "idm",
 		},
+		CreateDemoUsers: true,
+		ServiceUserPasswords: config.ServiceUserPasswords{
+			IdmAdmin: "idm",
+			Idp:      "idp",
+			Reva:     "reva",
+		},
 		IDM: config.Settings{
 			LDAPSAddr:    "127.0.0.1:9235",
 			Cert:         path.Join(defaults.BaseDataPath(), "idm", "ldap.crt"),