diff options
| author | Mark Felder <feld@feld.me> | 2021-01-25 09:45:06 -0600 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-25 09:45:06 -0600 |
| commit | 537ba1c5e07a33692ed63ca50b50e240efce6f88 (patch) | |
| tree | 2a364998d729d1f65d5b87b5703604ac8d163678 /priv/templates | |
| parent | 28581e03ad5761aa484a7fa427be8ab5695f0892 (diff) | |
| parent | 0a6f5f479348eff5f5404d4455fcb8254809812f (diff) | |
| download | pleroma-537ba1c5e07a33692ed63ca50b50e240efce6f88.tar.gz pleroma-537ba1c5e07a33692ed63ca50b50e240efce6f88.zip | |
Merge branch 'develop' into refactor/deactivated_user_field
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, |