aboutsummaryrefslogtreecommitdiff
path: root/lib/mix/tasks/sample_config.eex
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2018-01-12 20:57:31 +0000
committereal <eal@waifu.club>2018-01-12 20:57:31 +0000
commitd49109ca17f980e118cd5ab97bc1139e3bd14402 (patch)
treec7eb73702c1fbee1cb27cb35252ef447a07cbb1f /lib/mix/tasks/sample_config.eex
parent5c09d8d3f199a3f323471f9ba4578371226cd726 (diff)
parentd56ab43609985801c853b8743f4c33f691f59924 (diff)
downloadpleroma-d49109ca17f980e118cd5ab97bc1139e3bd14402.tar.gz
Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'
added question about activating mediaproxy to config generator See merge request pleroma/pleroma!44
Diffstat (limited to 'lib/mix/tasks/sample_config.eex')
-rw-r--r--lib/mix/tasks/sample_config.eex5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex
index 85a7c554e..9330fae2d 100644
--- a/lib/mix/tasks/sample_config.eex
+++ b/lib/mix/tasks/sample_config.eex
@@ -10,6 +10,11 @@ config :pleroma, :instance,
limit: 5000,
registrations_open: true
+config :pleroma, :media_proxy,
+ enabled: <%= mediaproxy %>,
+ redirect_on_failure: true,
+ base_url: "<%= proxy_url %>"
+
# Configure your database
config :pleroma, Pleroma.Repo,
adapter: Ecto.Adapters.Postgres,