summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-03-29 01:39:01 +0200
committerRoger Braun <roger@rogerbraun.net>2017-03-29 01:39:01 +0200
commit08fdbd6f3ab15ac8312073d832324516b723b81a (patch)
tree8546c68833fb842f455968f562a04e1fe6efc2b3 /config
parentd2cdcc097b171461687df1613371c4b04da60186 (diff)
downloadpleroma-08fdbd6f3ab15ac8312073d832324516b723b81a.tar.gz
pleroma-08fdbd6f3ab15ac8312073d832324516b723b81a.zip
Add Uploads.
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
-rw-r--r--config/test.exs3
2 files changed, 6 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 8eea4dd0a..bf050197f 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -9,6 +9,9 @@ use Mix.Config
config :pleroma,
ecto_repos: [Pleroma.Repo]
+config :pleroma, Pleroma.Upload,
+ uploads: "uploads"
+
# Configures the endpoint
config :pleroma, Pleroma.Web.Endpoint,
url: [host: "localhost"],
diff --git a/config/test.exs b/config/test.exs
index 07f49d3e9..f5d6f240d 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -9,6 +9,9 @@ config :pleroma, Pleroma.Web.Endpoint,
# Print only warnings and errors during test
config :logger, level: :warn
+config :pleroma, Pleroma.Upload,
+ uploads: "test/uploads"
+
# Configure your database
config :pleroma, Pleroma.Repo,
adapter: Ecto.Adapters.Postgres,