Skip to content

Commit

Permalink
Add missing environment variables in php-fpm config
Browse files Browse the repository at this point in the history
  • Loading branch information
fguillot committed Oct 4, 2020
1 parent e3e9cab commit ee842bf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion app/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
// 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
Expand Down
6 changes: 6 additions & 0 deletions docker/etc/php7/php-fpm.d/env.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

0 comments on commit ee842bf

Please sign in to comment.