From 6bb2f74690e288cae8250b6b321a50acd3db129d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 4 Nov 2022 11:21:38 +0000 Subject: [PATCH 1/3] auth basic readme fix env var rename MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/auth-basic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/auth-basic/README.md b/services/auth-basic/README.md index 8ed7f8294..f2a826c77 100644 --- a/services/auth-basic/README.md +++ b/services/auth-basic/README.md @@ -12,7 +12,7 @@ Since the `auth-basic` service does not do any validation itself, it needs to be ### LDAP Auth Manager -Setting `AUTH_BASIC_AUTH_PROVIDER` to `"ldap"` will configure the `auth-basic` service to use LDAP as auth manager. This is the recommended option for running in a production and testing environment. More details on how to configure LDAP with ocis can be found in the admin docs. +Setting `AUTH_BASIC_AUTH_MANAGER` to `"ldap"` will configure the `auth-basic` service to use LDAP as auth manager. This is the recommended option for running in a production and testing environment. More details on how to configure LDAP with ocis can be found in the admin docs. ### Other Auth Managers From de098ac5fe65ca77b55372fda82525ed75bda301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 4 Nov 2022 11:22:38 +0000 Subject: [PATCH 2/3] update changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/rename-authprovider.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog/unreleased/rename-authprovider.md b/changelog/unreleased/rename-authprovider.md index 710f40079..39aff4887 100644 --- a/changelog/unreleased/rename-authprovider.md +++ b/changelog/unreleased/rename-authprovider.md @@ -3,3 +3,4 @@ Enhancement: Rename AUTH_BASIC_AUTH_PROVIDER envvar Rename the `AUTH_BASIC_AUTH_PROVIDER` envvar to `AUTH_BASIC_AUTH_MANAGER` https://github.com/owncloud/ocis/pull/4966 +https://github.com/owncloud/ocis/pull/4981 \ No newline at end of file From 791c2e249414e082f7142a0fb6574585cb48251e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 4 Nov 2022 11:51:21 +0000 Subject: [PATCH 3/3] fix docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- services/auth-basic/pkg/config/config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/auth-basic/pkg/config/config.go b/services/auth-basic/pkg/config/config.go index 9e9a7caab..d9d386f5a 100644 --- a/services/auth-basic/pkg/config/config.go +++ b/services/auth-basic/pkg/config/config.go @@ -19,7 +19,7 @@ type Config struct { Reva *shared.Reva `yaml:"reva"` SkipUserGroupsInToken bool `yaml:"skip_user_groups_in_token" env:"AUTH_BASIC_SKIP_USER_GROUPS_IN_TOKEN" desc:"Disables the encoding of the user's group memberships in the reva access token. This reduces the token size, especially when users are members of a large number of groups."` - AuthProvider string `yaml:"auth_provider" env:"AUTH_BASIC_AUTH_MANAGER" desc:"The authentication provider to check if credentials are valid. Supported value is 'ldap'."` + AuthProvider string `yaml:"auth_provider" env:"AUTH_BASIC_AUTH_MANAGER" desc:"The authentication manager to check if credentials are valid. Supported value is 'ldap'."` AuthProviders AuthProviders `yaml:"auth_providers"` Supervised bool `yaml:"-"`