sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix startup with ocis init

Browse Source
This commit is contained in:
Willy Kloucek
2022-04-28 17:20:10 +02:00
parent 25254140ac
commit e582b609b5
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions/auth-basic/pkg/config/config.go
+1 -1
View File
@@ -64,7 +64,7 @@ type LDAPProvider struct {
CACert string `env:"LDAP_CACERT;AUTH_BASIC_LDAP_CACERT"` CACert string `env:"LDAP_CACERT;AUTH_BASIC_LDAP_CACERT"`
Insecure bool `env:"LDAP_INSECURE;AUTH_BASIC_LDAP_INSECURE"` Insecure bool `env:"LDAP_INSECURE;AUTH_BASIC_LDAP_INSECURE"`
BindDN string `env:"LDAP_BIND_DN;AUTH_BASIC_LDAP_BIND_DN"` BindDN string `env:"LDAP_BIND_DN;AUTH_BASIC_LDAP_BIND_DN"`
BindPassword string `env:"LDAP_BIND_PASSWORD;AUTH_BASIC_LDAP_BIND_PASSWORD"` BindPassword string `yaml:"bind_password" env:"LDAP_BIND_PASSWORD;AUTH_BASIC_LDAP_BIND_PASSWORD"`
UserBaseDN string `env:"LDAP_USER_BASE_DN;AUTH_BASIC_LDAP_USER_BASE_DN"` UserBaseDN string `env:"LDAP_USER_BASE_DN;AUTH_BASIC_LDAP_USER_BASE_DN"`
GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;AUTH_BASIC_LDAP_GROUP_BASE_DN"` GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;AUTH_BASIC_LDAP_GROUP_BASE_DN"`
UserScope string `env:"LDAP_USER_SCOPE;AUTH_BASIC_LDAP_USER_SCOPE"` UserScope string `env:"LDAP_USER_SCOPE;AUTH_BASIC_LDAP_USER_SCOPE"`
extensions/group/pkg/config/config.go
+1 -1
View File
@@ -65,7 +65,7 @@ type LDAPDriver struct {
CACert string `env:"LDAP_CACERT;GROUPS_LDAP_CACERT"` CACert string `env:"LDAP_CACERT;GROUPS_LDAP_CACERT"`
Insecure bool `env:"LDAP_INSECURE;GROUPS_LDAP_INSECURE"` Insecure bool `env:"LDAP_INSECURE;GROUPS_LDAP_INSECURE"`
BindDN string `env:"LDAP_BIND_DN;GROUPS_LDAP_BIND_DN"` BindDN string `env:"LDAP_BIND_DN;GROUPS_LDAP_BIND_DN"`
BindPassword string `env:"LDAP_BIND_PASSWORD;GROUPS_LDAP_BIND_PASSWORD"` BindPassword string `yaml:"bind_password" env:"LDAP_BIND_PASSWORD;GROUPS_LDAP_BIND_PASSWORD"`
UserBaseDN string `env:"LDAP_USER_BASE_DN;GROUPS_LDAP_USER_BASE_DN"` UserBaseDN string `env:"LDAP_USER_BASE_DN;GROUPS_LDAP_USER_BASE_DN"`
GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;GROUPS_LDAP_GROUP_BASE_DN"` GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;GROUPS_LDAP_GROUP_BASE_DN"`
UserScope string `env:"LDAP_USER_SCOPE;GROUPS_LDAP_USER_SCOPE"` UserScope string `env:"LDAP_USER_SCOPE;GROUPS_LDAP_USER_SCOPE"`
extensions/idp/pkg/config/defaults/defaultconfig.go
+1 -1
View File
@@ -69,7 +69,7 @@ func DefaultConfig() *config.Config {
URI: "ldaps://localhost:9235", URI: "ldaps://localhost:9235",
TLSCACert: path.Join(defaults.BaseDataPath(), "idm", "ldap.crt"), TLSCACert: path.Join(defaults.BaseDataPath(), "idm", "ldap.crt"),
BindDN: "uid=idp,ou=sysusers,o=libregraph-idm", BindDN: "uid=idp,ou=sysusers,o=libregraph-idm",
BindPassword: "idp", BindPassword: "",
BaseDN: "ou=users,o=libregraph-idm", BaseDN: "ou=users,o=libregraph-idm",
Scope: "sub", Scope: "sub",
LoginAttribute: "uid", LoginAttribute: "uid",
extensions/user/pkg/config/config.go
+1 -1
View File
@@ -65,7 +65,7 @@ type LDAPDriver struct {
CACert string `env:"LDAP_CACERT;USERS_LDAP_CACERT"` CACert string `env:"LDAP_CACERT;USERS_LDAP_CACERT"`
Insecure bool `env:"LDAP_INSECURE;USERS_LDAP_INSECURE"` Insecure bool `env:"LDAP_INSECURE;USERS_LDAP_INSECURE"`
BindDN string `env:"LDAP_BIND_DN;USERS_LDAP_BIND_DN"` BindDN string `env:"LDAP_BIND_DN;USERS_LDAP_BIND_DN"`
BindPassword string `env:"LDAP_BIND_PASSWORD;USERS_LDAP_BIND_PASSWORD"` BindPassword string `yaml:"bind_password" env:"LDAP_BIND_PASSWORD;USERS_LDAP_BIND_PASSWORD"`
UserBaseDN string `env:"LDAP_USER_BASE_DN;USERS_LDAP_USER_BASE_DN"` UserBaseDN string `env:"LDAP_USER_BASE_DN;USERS_LDAP_USER_BASE_DN"`
GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;USERS_LDAP_GROUP_BASE_DN"` GroupBaseDN string `env:"LDAP_GROUP_BASE_DN;USERS_LDAP_GROUP_BASE_DN"`
UserScope string `env:"LDAP_USER_SCOPE;USERS_LDAP_USER_SCOPE"` UserScope string `env:"LDAP_USER_SCOPE;USERS_LDAP_USER_SCOPE"`
ocis/pkg/init/init.go
+6 -6
View File
@@ -33,7 +33,7 @@ type DataProviderInsecureSettings struct {
} }
type LdapSettings struct { type LdapSettings struct {
Bindpassword string Bind_password string
} }
type LdapBasedExtension struct { type LdapBasedExtension struct {
Ldap LdapSettings Ldap LdapSettings
@@ -193,34 +193,34 @@ func CreateConfig(insecure, forceOverwrite bool, configPath string) error {
}, },
Idp: LdapBasedExtension{ Idp: LdapBasedExtension{
Ldap: LdapSettings{ Ldap: LdapSettings{
Bindpassword: idpServicePassword, Bind_password: idpServicePassword,
}, },
}, },
Auth_basic: AuthbasicExtension{ Auth_basic: AuthbasicExtension{
Auth_providers: LdapBasedExtension{ Auth_providers: LdapBasedExtension{
Ldap: LdapSettings{ Ldap: LdapSettings{
Bindpassword: revaServicePassword, Bind_password: revaServicePassword,
}, },
}, },
}, },
Group: UserAndGroupExtension{ Group: UserAndGroupExtension{
Drivers: LdapBasedExtension{ Drivers: LdapBasedExtension{
Ldap: LdapSettings{ Ldap: LdapSettings{
Bindpassword: revaServicePassword, Bind_password: revaServicePassword,
}, },
}, },
}, },
User: UserAndGroupExtension{ User: UserAndGroupExtension{
Drivers: LdapBasedExtension{ Drivers: LdapBasedExtension{
Ldap: LdapSettings{ Ldap: LdapSettings{
Bindpassword: revaServicePassword, Bind_password: revaServicePassword,
}, },
}, },
}, },
Graph: GraphExtension{ Graph: GraphExtension{
Identity: LdapBasedExtension{ Identity: LdapBasedExtension{
Ldap: LdapSettings{ Ldap: LdapSettings{
Bindpassword: idmServicePassword, Bind_password: idmServicePassword,
}, },
}, },
}, },