From 14f02aa71cc7c1a199eedd17fc23ef8227382453 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 12 Dec 2019 14:46:58 -0800 Subject: [PATCH] Remove ldap encryption patch https://github.com/tootsuite/mastodon/blob/bd8dc9bd0c9857470f14189c15572cab18bf8ab1/app/models/concerns/ldap_authenticable.rb#L50 --- Dockerfile | 3 --- patches/Remove_LDAP_encryption.patch | 18 ------------------ 2 files changed, 21 deletions(-) delete mode 100644 patches/Remove_LDAP_encryption.patch diff --git a/Dockerfile b/Dockerfile index 7d91e36..6181f78 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,9 +24,6 @@ RUN curl -L https://github.com/tootsuite/mastodon/archive/v${VERSION}.tar.gz | t bundle install --deployment --without test development && \ yarn install --pure-lockfile -COPY patches /app/code/patches -RUN for patch in /app/code/patches/*; do patch -N -p0 < $patch; done - # secret keys are not built into assets, so precompiling is safe to do here # (these variables are required by rake though) RUN SECRET_KEY_BASE=insecure.secret_key_base OTP_SECRET=insecure.otp_secret \ diff --git a/patches/Remove_LDAP_encryption.patch b/patches/Remove_LDAP_encryption.patch deleted file mode 100644 index b8792c3..0000000 --- a/patches/Remove_LDAP_encryption.patch +++ /dev/null @@ -1,18 +0,0 @@ -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,