diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-07-09 12:49:04 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-07-09 12:49:04 -0500 |
| commit | 9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96 (patch) | |
| tree | fc28e2fb05ad0158fe881de7a49e90d941e10ad4 /priv | |
| parent | 9f235028569968871ef9ea933459c6e9369e737a (diff) | |
| parent | e19e82975871388831fd23adc50fcaaea85ad5da (diff) | |
| download | pleroma-9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96.tar.gz pleroma-9a9b60cfbcbcdf3e48e42aa75ff530007cf03b96.zip | |
Merge branch 'develop' into feature/allow-user-query-via-id
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/templates/sample_config.eex | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index 2d4a49328..5cc31c604 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -67,20 +67,3 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>" # For using third-party S3 clones like wasabi, also do: # 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>" -# |