diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-06-03 15:29:53 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-06-03 15:29:53 -0500 |
| commit | 6ef145b4fc3f2ddb5865e84039c3b56656529711 (patch) | |
| tree | a10cab9e7561bdaa76777cfc6d0c3c6fe1f8189b /config | |
| parent | 5cee2fe9fea4f0c98acd49a2a288ecd44bce3d1f (diff) | |
| parent | 662e95e9484a46bfc72c2edc305aefae99ff68b0 (diff) | |
| download | pleroma-6ef145b4fc3f2ddb5865e84039c3b56656529711.tar.gz pleroma-6ef145b4fc3f2ddb5865e84039c3b56656529711.zip | |
Merge branch 'develop' into feature/digest-email
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 6 | ||||
| -rw-r--r-- | config/dokku.exs | 25 |
2 files changed, 31 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index ac7e63956..92af4ca1b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -208,6 +208,12 @@ config :pleroma, :instance, avatar_upload_limit: 2_000_000, background_upload_limit: 4_000_000, banner_upload_limit: 4_000_000, + poll_limits: %{ + max_options: 20, + max_option_chars: 200, + min_expiration: 0, + max_expiration: 365 * 24 * 60 * 60 + }, registrations_open: true, federating: true, federation_reachability_timeout_days: 7, diff --git a/config/dokku.exs b/config/dokku.exs new file mode 100644 index 000000000..9ea0ec450 --- /dev/null +++ b/config/dokku.exs @@ -0,0 +1,25 @@ +use Mix.Config + +config :pleroma, Pleroma.Web.Endpoint, + http: [ + port: String.to_integer(System.get_env("PORT") || "4000"), + protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192] + ], + protocol: "http", + secure_cookie_flag: false, + url: [host: System.get_env("APP_HOST"), scheme: "https", port: 443], + secret_key_base: "+S+ULgf7+N37c/lc9K66SMphnjQIRGklTu0BRr2vLm2ZzvK0Z6OH/PE77wlUNtvP" + +database_url = + System.get_env("DATABASE_URL") || + raise """ + environment variable DATABASE_URL is missing. + For example: ecto://USER:PASS@HOST/DATABASE + """ + +config :pleroma, Pleroma.Repo, + # ssl: true, + url: database_url, + pool_size: String.to_integer(System.get_env("POOL_SIZE") || "10") + +config :pleroma, :instance, name: "#{System.get_env("APP_NAME")} CI Instance" |