summaryrefslogtreecommitdiff
path: root/priv/templates
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2019-07-09 21:21:09 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2019-07-09 21:21:09 +0300
commit371d39e160efa51f2fe608e1788f6b11b89d9839 (patch)
treeb5dc6280d713f11392fd47bffd1a675b527162f5 /priv/templates
parentd2cb18b2a342b990cc47dfdc42adb843c3db1b5e (diff)
parent670a77ecbc94d57c6ecb5e569597e81cee4b5532 (diff)
downloadpleroma-371d39e160efa51f2fe608e1788f6b11b89d9839.tar.gz
pleroma-371d39e160efa51f2fe608e1788f6b11b89d9839.zip
Merge develop
Diffstat (limited to 'priv/templates')
-rw-r--r--priv/templates/sample_config.eex17
1 files changed, 0 insertions, 17 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex
index 7f275279e..5b4dad648 100644
--- a/priv/templates/sample_config.eex
+++ b/priv/templates/sample_config.eex
@@ -68,21 +68,4 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
# config :ex_aws, :s3,
# host: "s3.wasabisys.com"
-
-# Configure Openstack Swift support if desired.
-#
-# Many openstack deployments are different, so config is left very open with
-# no assumptions made on which provider you're using. This should allow very
-# wide support without needing separate handlers for OVH, Rackspace, etc.
-#
-# config :pleroma, Pleroma.Uploaders.Swift,
-# container: "some-container",
-# username: "api-username-yyyy",
-# password: "api-key-xxxx",
-# tenant_id: "<openstack-project/tenant-id>",
-# auth_url: "https://keystone-endpoint.provider.com",
-# storage_url: "https://swift-endpoint.prodider.com/v1/AUTH_<tenant>/<container>",
-# object_url: "https://cdn-endpoint.provider.com/<container>"
-#
-
config :joken, default_signer: "<%= jwt_secret %>"