From 6bd82c37ef47b28be839faadc2fa822254f35b86 Mon Sep 17 00:00:00 2001 From: Ilja Neumann Date: Wed, 18 Mar 2020 20:18:52 +0100 Subject: [PATCH 1/2] Change default settings to be able to run ocis server without any configuration - Konnectd uses no TLS as it is behind the proxy - Glauth generates dev-certificates for ldap on startup if none are provided, - Glauth can launch unencrypted (9125) and encrypted (9126) port in parallel --- changelog/unreleased/change-internal-defaults.md | 3 +++ pkg/service/v0/service.go | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 changelog/unreleased/change-internal-defaults.md diff --git a/changelog/unreleased/change-internal-defaults.md b/changelog/unreleased/change-internal-defaults.md new file mode 100644 index 0000000000..ab9bda0a16 --- /dev/null +++ b/changelog/unreleased/change-internal-defaults.md @@ -0,0 +1,3 @@ +Enhancement: Change internal-default config to have zero-configuration in single-binary mode + +https://github.com/owncloud/ocis-konnectd/pull/55 diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go index eebcfa24a1..a99f991287 100644 --- a/pkg/service/v0/service.go +++ b/pkg/service/v0/service.go @@ -113,10 +113,10 @@ func initKonnectInternalEnvVars() error { "LDAP_BINDPW": "konnectd", "LDAP_BASEDN": "ou=users,dc=example,dc=org", "LDAP_SCOPE": "sub", - "LDAP_LOGIN_ATTRIBUTE": "uid", + "LDAP_LOGIN_ATTRIBUTE": "cn", "LDAP_EMAIL_ATTRIBUTE": "mail", - "LDAP_NAME_ATTRIBUTE": "cn", - "LDAP_UUID_ATTRIBUTE": "customuid", + "LDAP_NAME_ATTRIBUTE": "sn", + "LDAP_UUID_ATTRIBUTE": "uid", "LDAP_UUID_ATTRIBUTE_TYPE": "text", "LDAP_FILTER": "(objectClass=posixaccount)", } From a2a730ce5a9dee6d5216687db27a61b95deaac92 Mon Sep 17 00:00:00 2001 From: Ilja Neumann Date: Wed, 18 Mar 2020 21:15:48 +0100 Subject: [PATCH 2/2] Update changelog --- changelog/unreleased/change-internal-defaults.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/unreleased/change-internal-defaults.md b/changelog/unreleased/change-internal-defaults.md index ab9bda0a16..a8101f7ee5 100644 --- a/changelog/unreleased/change-internal-defaults.md +++ b/changelog/unreleased/change-internal-defaults.md @@ -1,3 +1,3 @@ -Enhancement: Change internal-default config to have zero-configuration in single-binary mode +Enhancement: Change default config for single-binary https://github.com/owncloud/ocis-konnectd/pull/55