diff options
| author | kaniini <nenolod@gmail.com> | 2019-07-09 16:54:32 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-07-09 16:54:32 +0000 |
| commit | 4948117fcf297efa735cdafb9cddf39946668266 (patch) | |
| tree | 005e8f315aa490e5ac510048bb992f1995d08e53 /priv | |
| parent | b6fd16d0a424f916b7338237a2972e595e404955 (diff) | |
| parent | 11143c542a012f64db8db0fa7b82f063ef338e94 (diff) | |
| download | pleroma-4948117fcf297efa735cdafb9cddf39946668266.tar.gz pleroma-4948117fcf297efa735cdafb9cddf39946668266.zip | |
Merge branch 'remove-swift' into 'develop'
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
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>" -# |