summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-05-12 20:20:19 +0000
committerrinpatch <rinpatch@sdf.org>2020-05-12 20:20:19 +0000
commitc74018e6a7a19a40a75c343ddadc199d9990597e (patch)
treeffb2a5f13a3821c2c6747c41eaece388ad3fcf60
parent2b18b8a2634dbf6529cb0aab831db9c1a2efd2db (diff)
parentda2fe8920de0ab7455de9f72e74a3ef764db6ad3 (diff)
downloadpleroma-c74018e6a7a19a40a75c343ddadc199d9990597e.tar.gz
pleroma-c74018e6a7a19a40a75c343ddadc199d9990597e.zip
Merge branch 'fix/eldap-required' into 'develop'
fix eldap being required for non-OTP releases See merge request pleroma/pleroma!2520
-rw-r--r--mix.exs5
1 files changed, 2 insertions, 3 deletions
diff --git a/mix.exs b/mix.exs
index 97b561790..3656059f2 100644
--- 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]
]