diff --git a/.env.example b/.env.example index 1c69588792..9581358e1d 100644 --- a/.env.example +++ b/.env.example @@ -38,12 +38,6 @@ TRUSTED_PROXIES= # Also available are 'syslog', 'errorlog' and 'stdout' which will log to the system itself. # A rotating log option is 'daily', creates 5 files that (surprise) rotate. # Default setting 'stack' will log to 'daily' and to 'stdout' at the same time. - -# - Docker + versions <= 4.8.1.8 and before: use "stdout" -# - Docker + versions > 4.8.1.8 : use "docker_out" -# - Docker + versions >= 5.1.1 : use "stack" -# - For everything else (als not Docker) : use 'stack' - LOG_CHANNEL=stack # Log level. You can set this from least severe to most severe: @@ -174,23 +168,21 @@ MAP_DEFAULT_ZOOM=6 # - 'remote_user_guard' for Authelia etc # Read more about these settings in the documentation. # https://docs.firefly-iii.org/advanced-installation/authentication - -# -# Set to 'ldap' to enable LDAP -# AUTHENTICATION_GUARD=web # # LDAP connection settings: # LDAP_HOST=ldap.yourserver.com -LDAP_USERNAME="uid=X,ou=,o=,dc=something,dc=com" -LDAP_PASSWORD=super_secret LDAP_PORT=389 -LDAP_BASE_DN="o=something,dc=site,dc=com" LDAP_TIMEOUT=5 LDAP_SSL=false LDAP_TLS=false + +LDAP_BASE_DN="o=something,dc=site,dc=com" +LDAP_USERNAME="uid=X,ou=,o=,dc=something,dc=com" +LDAP_PASSWORD=super_secret + LDAP_AUTH_FIELD=uid # @@ -199,7 +191,6 @@ LDAP_AUTH_FIELD=uid AUTHENTICATION_GUARD_HEADER=REMOTE_USER AUTHENTICATION_GUARD_EMAIL= - # # Extra authentication settings # diff --git a/composer.json b/composer.json index e1ca58f0bf..387d50fc90 100644 --- a/composer.json +++ b/composer.json @@ -84,7 +84,6 @@ "ext-xml": "*", "bacon/bacon-qr-code": "2.*", "diglactic/laravel-breadcrumbs": "^7.0", - "directorytree/ldaprecord-laravel": "^2.2", "doctrine/dbal": "3.*", "fideloper/proxy": "4.*", "gdbots/query-parser": "^2.0",