aboutsummaryrefslogtreecommitdiff
path: root/lib/mix/tasks/sample_config.eex
diff options
context:
space:
mode:
authorFrancis Dinh <normandy@firemail.cc>2018-04-20 16:47:44 -0400
committerFrancis Dinh <normandy@firemail.cc>2018-04-20 16:48:18 -0400
commitc5dc7e6e3166674744b33f0a098622f263edb605 (patch)
tree9059aa5684e377c16f71da2e0f581e355809a1a5 /lib/mix/tasks/sample_config.eex
parent32a26eb91048bb92abfd3c7770dc0d72855101c3 (diff)
parenta61e8ac15473aca6d0ec9ef20df981bcef9d5897 (diff)
downloadpleroma-c5dc7e6e3166674744b33f0a098622f263edb605.tar.gz
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
Diffstat (limited to 'lib/mix/tasks/sample_config.eex')
-rw-r--r--lib/mix/tasks/sample_config.eex6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/mix/tasks/sample_config.eex b/lib/mix/tasks/sample_config.eex
index 9330fae2d..e37c864c0 100644
--- a/lib/mix/tasks/sample_config.eex
+++ b/lib/mix/tasks/sample_config.eex
@@ -11,9 +11,9 @@ config :pleroma, :instance,
registrations_open: true
config :pleroma, :media_proxy,
- enabled: <%= mediaproxy %>,
- redirect_on_failure: true,
- base_url: "<%= proxy_url %>"
+ enabled: false,
+ redirect_on_failure: true
+ #base_url: "https://cache.pleroma.social"
# Configure your database
config :pleroma, Pleroma.Repo,