diff options
author | rinpatch <rinpatch@sdf.org> | 2019-06-21 06:41:13 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-06-21 06:41:13 +0300 |
commit | d55358f3705c34510f5ec1d9cef7ab3b0f11ed2f (patch) | |
tree | 2a6018046d37201c6d0236a0ea23ffabbeb86d5c /lib/mix/tasks/pleroma/sample_config.eex | |
parent | 4bec121798218f8abf8d2915fa7c26ccb23a4f4a (diff) | |
parent | 2437f5128407bbcdfc152ea3f008d7eecc1728f2 (diff) | |
download | pleroma-d55358f3705c34510f5ec1d9cef7ab3b0f11ed2f.tar.gz |
Merge branch 'develop' into release-docs
Diffstat (limited to 'lib/mix/tasks/pleroma/sample_config.eex')
-rw-r--r-- | lib/mix/tasks/pleroma/sample_config.eex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/lib/mix/tasks/pleroma/sample_config.eex index 73d9217be..8b45acb05 100644 --- a/lib/mix/tasks/pleroma/sample_config.eex +++ b/lib/mix/tasks/pleroma/sample_config.eex @@ -16,7 +16,6 @@ config :pleroma, :instance, notify_email: "<%= notify_email %>", limit: 5000, registrations_open: true, - dedupe_media: false, dynamic_configuration: <%= db_configurable? %> config :pleroma, :media_proxy, @@ -38,6 +37,9 @@ config :web_push_encryption, :vapid_details, public_key: "<%= web_push_public_key %>", private_key: "<%= web_push_private_key %>" +config :pleroma, :instance, static_dir: "<%= static_dir %>" +config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>" + # Enable Strict-Transport-Security once SSL is working: # config :pleroma, :http_security, # sts: true |