logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: c74018e6a7a19a40a75c343ddadc199d9990597e
parent: 2b18b8a2634dbf6529cb0aab831db9c1a2efd2db
Author: rinpatch <rinpatch@sdf.org>
Date:   Tue, 12 May 2020 20:20:19 +0000

Merge branch 'fix/eldap-required' into 'develop'

fix eldap being required for non-OTP releases

See merge request pleroma/pleroma!2520

Diffstat:

Mmix.exs5++---
1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mix.exs b/mix.exs @@ -36,7 +36,7 @@ defmodule Pleroma.Mixfile do releases: [ pleroma: [ include_executables_for: [:unix], - applications: [ex_syslogger: :load, syslog: :load], + applications: [ex_syslogger: :load, syslog: :load, eldap: :transient], steps: [:assemble, &put_otp_version/1, &copy_files/1, &copy_nginx_config/1] ] ] @@ -78,8 +78,7 @@ defmodule Pleroma.Mixfile do :comeonin, :quack, :fast_sanitize, - :ssl, - :eldap + :ssl ], included_applications: [:ex_syslogger] ]