Enabling LDAP

This commit is contained in:
Aleksandr Bogdanov 2018-10-31 13:55:50 +01:00
parent 87ab3e10f3
commit b5a75dea5a
4 changed files with 25 additions and 2 deletions

View file

@ -13,7 +13,8 @@
"localstorage": {}, "localstorage": {},
"postgresql": {}, "postgresql": {},
"redis": {}, "redis": {},
"sendmail": {} "sendmail": {},
"ldap": {}
}, },
"minBoxVersion": "1.8.1", "minBoxVersion": "1.8.1",
"manifestVersion": 1, "manifestVersion": 1,

View file

@ -28,6 +28,9 @@ RUN git init && \
git fetch --depth=1 origin $(git ls-remote --tags | grep refs/tags | grep -v 'rc[0-9]*$' | cut -f2 | sort -V | tail -n 1 | cut -d '/' -f3-) && \ git fetch --depth=1 origin $(git ls-remote --tags | grep refs/tags | grep -v 'rc[0-9]*$' | cut -f2 | sort -V | tail -n 1 | cut -d '/' -f3-) && \
git checkout FETCH_HEAD git checkout FETCH_HEAD
COPY patches /app/code/patches
RUN for patch in /app/code/patches/*; do patch -N -p0 < $patch; done
RUN bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test && \ RUN bundle install -j$(getconf _NPROCESSORS_ONLN) --deployment --without development test && \
yarn install --pure-lockfile yarn install --pure-lockfile

View file

@ -30,7 +30,8 @@ LDAP_PORT=${LDAP_PORT}
LDAP_BASE=${LDAP_USERS_BASE_DN} LDAP_BASE=${LDAP_USERS_BASE_DN}
LDAP_BIND_DN=${LDAP_BIND_DN} LDAP_BIND_DN=${LDAP_BIND_DN}
LDAP_PASSWORD=${LDAP_BIND_PASSWORD} LDAP_PASSWORD=${LDAP_BIND_PASSWORD}
LDAP_UID=mail LDAP_UID=username
LDAP_SEARCH_FILTER=(|(%{uid}=%{email})(mail=%{email}))
# the following is generated by start.sh # the following is generated by start.sh
END END

View file

@ -0,0 +1,18 @@
Index: lib/devise/ldap_authenticatable.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lib/devise/ldap_authenticatable.rb (date 1539296558000)
+++ lib/devise/ldap_authenticatable.rb (date 1540988096000)
@@ -12,10 +12,6 @@
host: Devise.ldap_host,
port: Devise.ldap_port,
base: Devise.ldap_base,
- encryption: {
- method: Devise.ldap_method,
- tls_options: tls_options,
- },
auth: {
method: :simple,
username: Devise.ldap_bind_dn,