diff options
| author | lain <lain@soykaf.club> | 2021-03-02 19:54:30 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-03-02 19:54:30 +0000 |
| commit | b221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (patch) | |
| tree | 0015c7c3ea57f7340fbf80fd230a5f5e1c548148 /priv/templates | |
| parent | c2186a62d54043ea9638d33f80c7576aba9783e8 (diff) | |
| parent | 0a589c887bd4215e7d443a34c194fd0a3bde8f72 (diff) | |
| download | pleroma-b221d77a6da07c684bdbc63ddf4500e0d7ffeae8.tar.gz pleroma-b221d77a6da07c684bdbc63ddf4500e0d7ffeae8.zip | |
Merge branch 'release/2.3.0' into 'stable'
Release/2.3.0
See merge request pleroma/pleroma!3354
Diffstat (limited to 'priv/templates')
| -rw-r--r-- | priv/templates/sample_config.eex | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index cdddc47ea..42f496ded 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -32,8 +32,7 @@ config :pleroma, Pleroma.Repo, username: "<%= dbuser %>", password: "<%= dbpass %>", database: "<%= dbname %>", - hostname: "<%= dbhost %>", - pool_size: 10 + hostname: "<%= dbhost %>" # Configure web push notifications config :web_push_encryption, :vapid_details, @@ -50,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, |