summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-06-07 10:58:09 +0000
committerkaniini <nenolod@gmail.com>2019-06-07 10:58:09 +0000
commitd5330ed12561377e5c464bcc2774ebc692b9ac07 (patch)
treeb7392cfcd40fa369875a687d360557be2727318e /config/config.exs
parentcb89987ca1c473e837005191ea23a9bdf45fa3bf (diff)
parent92213fb87c7996caf9d1188a94907d2231ba25c8 (diff)
downloadpleroma-d5330ed12561377e5c464bcc2774ebc692b9ac07.tar.gz
pleroma-d5330ed12561377e5c464bcc2774ebc692b9ac07.zip
Merge branch 'fix/replace-mix-env' into 'develop'
Replace Mix.env with Pleroma.Config.get(:env) See merge request pleroma/pleroma!1254
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 4e2b1703b..c6bf71fc8 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -500,6 +500,8 @@ config :pleroma, :oauth2,
config :pleroma, :database, rum_enabled: false
+config :pleroma, :env, Mix.env()
+
config :http_signatures,
adapter: Pleroma.Signature