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

fix eldap being required for non-OTP releases

See merge request pleroma/pleroma!2520
This commit is contained in:
rinpatch 2020-05-12 20:20:19 +00:00
commit c74018e6a7

View file

@ -36,7 +36,7 @@ defmodule Pleroma.Mixfile do
releases: [ releases: [
pleroma: [ pleroma: [
include_executables_for: [:unix], 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] steps: [:assemble, &put_otp_version/1, &copy_files/1, &copy_nginx_config/1]
] ]
] ]
@ -78,8 +78,7 @@ defmodule Pleroma.Mixfile do
:comeonin, :comeonin,
:quack, :quack,
:fast_sanitize, :fast_sanitize,
:ssl, :ssl
:eldap
], ],
included_applications: [:ex_syslogger] included_applications: [:ex_syslogger]
] ]