diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-12-17 09:04:43 -0600 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-12-17 09:05:36 -0600 |
| commit | 80891e83d8df25b742a321d2c837e38c805e6582 (patch) | |
| tree | 915321403b8a1639fa317b72d438b8a61a0eb090 /config/config.exs | |
| parent | 4999efad3f0bb0a70a5be5d5c2b970ab564668ca (diff) | |
| parent | 8b8c317c0ff1534d3296369ba315b8919e8dc55c (diff) | |
| download | pleroma-80891e83d8df25b742a321d2c837e38c805e6582.tar.gz pleroma-80891e83d8df25b742a321d2c837e38c805e6582.zip | |
Merge remote-tracking branch 'upstream/develop' into registration-workflow
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/config/config.exs b/config/config.exs index be5257663..98c87a4f9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -147,16 +147,6 @@ config :pleroma, Pleroma.Web.Endpoint, "SameSite=Lax" ] -config :pleroma, :fed_sockets, - enabled: false, - connection_duration: :timer.hours(8), - rejection_duration: :timer.minutes(15), - fed_socket_fetches: [ - default: 12_000, - interval: 3_000, - lazy: false - ] - # Configures Elixir's Logger config :logger, :console, level: :debug, @@ -316,7 +306,7 @@ config :pleroma, :frontend_configurations, hideSitename: false, hideUserStats: false, loginMethod: "password", - logo: "/static/logo.png", + logo: "/static/logo.svg", logoMargin: ".1em", logoMask: true, minimalScopesMode: false, @@ -353,8 +343,8 @@ config :pleroma, :assets, config :pleroma, :manifest, icons: [ %{ - src: "/static/logo.png", - type: "image/png" + src: "/static/logo.svg", + type: "image/svg+xml" } ], theme_color: "#282c37", @@ -658,7 +648,7 @@ config :pleroma, :email_notifications, } config :pleroma, :oauth2, - token_expires_in: 600, + token_expires_in: 3600 * 24 * 30, issue_new_refresh_token: true, clean_expired_tokens: false |