diff --git a/app/constants.php b/app/constants.php index 9955ce5be..fcca78359 100644 --- a/app/constants.php +++ b/app/constants.php @@ -96,8 +96,8 @@ defined('LDAP_GROUP_ATTRIBUTE_NAME') or define('LDAP_GROUP_ATTRIBUTE_NAME', gete // Proxy authentication defined('REVERSE_PROXY_AUTH') or define('REVERSE_PROXY_AUTH', strtolower(getenv('REVERSE_PROXY_AUTH')) === 'true'); defined('REVERSE_PROXY_USER_HEADER') or define('REVERSE_PROXY_USER_HEADER', getenv('REVERSE_PROXY_USER_HEADER') ?: 'REMOTE_USER'); -defined('REVERSE_PROXY_DEFAULT_ADMIN') or define('REVERSE_PROXY_DEFAULT_ADMIN', getenv('REVERSE_PROXY_DEFAULT_ADMIN') ?: ''); defined('REVERSE_PROXY_EMAIL_HEADER') or define('REVERSE_PROXY_EMAIL_HEADER', getenv('REVERSE_PROXY_EMAIL_HEADER') ?: 'REMOTE_EMAIL'); +defined('REVERSE_PROXY_DEFAULT_ADMIN') or define('REVERSE_PROXY_DEFAULT_ADMIN', getenv('REVERSE_PROXY_DEFAULT_ADMIN') ?: ''); defined('REVERSE_PROXY_DEFAULT_DOMAIN') or define('REVERSE_PROXY_DEFAULT_DOMAIN', getenv('REVERSE_PROXY_DEFAULT_DOMAIN') ?: ''); // Remember me authentication diff --git a/docker/etc/php7/php-fpm.d/env.conf b/docker/etc/php7/php-fpm.d/env.conf index 650a8cf63..ebd21e98f 100644 --- a/docker/etc/php7/php-fpm.d/env.conf +++ b/docker/etc/php7/php-fpm.d/env.conf @@ -76,6 +76,7 @@ env[LDAP_USER_ATTRIBUTE_GROUPS] = $LDAP_USER_ATTRIBUTE_GROUPS env[LDAP_USER_ATTRIBUTE_PHOTO] = $LDAP_USER_ATTRIBUTE_PHOTO env[LDAP_USER_ATTRIBUTE_LANGUAGE] = $LDAP_USER_ATTRIBUTE_LANGUAGE env[LDAP_USER_CREATION] = $LDAP_USER_CREATION +env[LDAP_USER_DEFAULT_ROLE_MANAGER] = $LDAP_USER_DEFAULT_ROLE_MANAGER env[LDAP_GROUP_ADMIN_DN] = $LDAP_GROUP_ADMIN_DN env[LDAP_GROUP_MANAGER_DN] = $LDAP_GROUP_MANAGER_DN @@ -84,11 +85,13 @@ env[LDAP_GROUP_PROVIDER] = $LDAP_GROUP_PROVIDER env[LDAP_GROUP_BASE_DN] = $LDAP_GROUP_BASE_DN env[LDAP_GROUP_FILTER] = $LDAP_GROUP_FILTER env[LDAP_GROUP_USER_FILTER] = $LDAP_GROUP_USER_FILTER +env[LDAP_GROUP_USER_ATTRIBUTE] = $LDAP_GROUP_USER_ATTRIBUTE env[LDAP_GROUP_ATTRIBUTE_NAME] = $LDAP_GROUP_ATTRIBUTE_NAME ; Proxy authentication env[REVERSE_PROXY_AUTH] = $REVERSE_PROXY_AUTH env[REVERSE_PROXY_USER_HEADER] = $REVERSE_PROXY_USER_HEADER +env[REVERSE_PROXY_EMAIL_HEADER] = $REVERSE_PROXY_EMAIL_HEADER env[REVERSE_PROXY_DEFAULT_ADMIN] = $REVERSE_PROXY_DEFAULT_ADMIN env[REVERSE_PROXY_DEFAULT_DOMAIN] = $REVERSE_PROXY_DEFAULT_DOMAIN @@ -151,6 +154,9 @@ env[TOTP_ISSUER] = $TOTP_ISSUER ; Comma separated list of fields to not synchronize when using external authentication providers env[EXTERNAL_AUTH_EXCLUDE_FIELDS] = $EXTERNAL_AUTH_EXCLUDE_FIELDS +env[SHOW_GROUP_MEMBERSHIPS_IN_USERLIST] = $SHOW_GROUP_MEMBERSHIPS_IN_USERLIST +env[SHOW_GROUP_MEMBERSHIPS_IN_USERLIST_WITH_LIMIT] = $SHOW_GROUP_MEMBERSHIPS_IN_USERLIST_WITH_LIMIT + ; Documentation URL env[DOCUMENTATION_URL_PATTERN] = $DOCUMENTATION_URL_PATTERN