Skip to content
This repository has been archived by the owner on Jan 27, 2021. It is now read-only.

integrate with current ocis config #52

Merged
merged 2 commits into from
Mar 17, 2020
Merged

integrate with current ocis config #52

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b88009d
integrate with current ocis config
butonic Mar 17, 2020
512aec0
Merge branch 'master' into update-config
refs Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions changelog/unreleased/new-ocis-config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Change: use glauth as ldap backend, default to running behind ocis-proxy

We changed the default configuration to integrate better with ocis.

The default ldap port changes to 9125, which is used by ocis-glauth and we use ocis-proxy to do the tls offloading.
Clients are supposed to use the ocis-proxy endpoint `https://localhost:9200`

https://github.com/owncloud/ocis-konnectd/pull/52
4 changes: 2 additions & 2 deletions pkg/flagset/flagset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
Name: "iss",
Usage: "OIDC issuer URL",
EnvVars: []string{"KONNECTD_ISS"},
Value: "https://localhost:9130",
Value: "https://localhost:9200",
Destination: &cfg.Konnectd.Iss,
},
&cli.StringSliceFlag{
Expand Down Expand Up @@ -271,7 +271,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
Name: "tls",
Usage: "Use TLS (disable only if konnectd is behind a TLS-terminating reverse-proxy).",
EnvVars: []string{"KONNECTD_TLS"},
Value: true,
Value: false,
Destination: &cfg.HTTP.TLS,
},
&cli.StringSliceFlag{
Expand Down
6 changes: 3 additions & 3 deletions pkg/service/v0/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,16 +109,16 @@ func createConfigsIfNotExist(assets http.FileSystem) error {
func initKonnectInternalEnvVars() error {
var defaults = map[string]string{
"LDAP_URI": "ldap://localhost:9125",
"LDAP_BINDDN": "cn=admin,dc=example,dc=org",
"LDAP_BINDPW": "admin",
"LDAP_BINDDN": "cn=konnectd,ou=sysusers,dc=example,dc=org",
"LDAP_BINDPW": "konnectd",
"LDAP_BASEDN": "ou=users,dc=example,dc=org",
"LDAP_SCOPE": "sub",
"LDAP_LOGIN_ATTRIBUTE": "uid",
"LDAP_EMAIL_ATTRIBUTE": "mail",
"LDAP_NAME_ATTRIBUTE": "cn",
"LDAP_UUID_ATTRIBUTE": "customuid",
"LDAP_UUID_ATTRIBUTE_TYPE": "text",
"LDAP_FILTER": "(objectClass=person)",
"LDAP_FILTER": "(objectClass=posixaccount)",
}

for k, v := range defaults {
Expand Down