diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-27 12:51:31 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-27 12:51:31 -0500 |
| commit | 9e54ef086b45c9df38eb293e4db2ea653261c83b (patch) | |
| tree | 4510ec649a6db5116b4a50c0fe9363592938a45b /config | |
| parent | 034ac43f3a91178694d3c621c52ce68207ec4f69 (diff) | |
| parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
| download | pleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.tar.gz pleroma-9e54ef086b45c9df38eb293e4db2ea653261c83b.zip | |
Merge branch 'develop' into feature/account-export
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index c758c818c..4adac435c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -123,7 +123,6 @@ websocket_config = [ # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, - instrumenters: [Pleroma.Web.Endpoint.Instrumenter], url: [host: "localhost"], http: [ ip: {127, 0, 0, 1}, @@ -143,7 +142,7 @@ config :pleroma, Pleroma.Web.Endpoint, secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl", signing_salt: "CqaoopA2", render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)], - pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2], + pubsub_server: Pleroma.PubSub, secure_cookie_flag: true, extra_cookie_attrs: [ "SameSite=Lax" |