diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-04-29 11:14:32 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-04-29 11:14:32 -0500 |
| commit | 762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0 (patch) | |
| tree | 0416ef7020ba2b333cb223200d7108928f714fde /priv/templates | |
| parent | b7b05a074867c1444dd539d6d2331f6d5504f6e6 (diff) | |
| parent | 115673bce773f91630c3bd4fd2d0023f92bee163 (diff) | |
| download | pleroma-762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0.tar.gz pleroma-762be6ce10d2145e8e31d42c5d1a0bab93dbe7b0.zip | |
Merge remote-tracking branch 'upstream/develop' into block-behavior
Diffstat (limited to 'priv/templates')
| -rw-r--r-- | priv/templates/sample_config.eex | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index 2f5952ef1..42f496ded 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -49,12 +49,18 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>" # sts: true # Configure S3 support if desired. -# The public S3 endpoint is different depending on region and provider, +# The public S3 endpoint (base_url) is different depending on region and provider, # consult your S3 provider's documentation for details on what to use. # +# config :pleroma, Pleroma.Upload, +# uploader: Pleroma.Uploaders.S3, +# base_url: "https://s3.amazonaws.com" +# # config :pleroma, Pleroma.Uploaders.S3, # bucket: "some-bucket", -# public_endpoint: "https://s3.amazonaws.com" +# bucket_namespace: "my-namespace", +# truncated_namespace: nil, +# streaming_enabled: true # # Configure S3 credentials: # config :ex_aws, :s3, |