summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-09-07 23:55:42 +0000
committerkaniini <nenolod@gmail.com>2018-09-07 23:55:42 +0000
commit530561a091f6f82e27ef3d5011b929b00e2da964 (patch)
treeb83ecbfe5b2c6febfedb414f4f4b841938387555 /config
parentb0ec4f33e661cb14730a622d64dbc721e2723825 (diff)
parent18ad8aaecfae154deabab6f82da0c06dcf91d4c1 (diff)
downloadpleroma-530561a091f6f82e27ef3d5011b929b00e2da964.tar.gz
pleroma-530561a091f6f82e27ef3d5011b929b00e2da964.zip
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
Add Secure and SameSite cookie flags See merge request pleroma/pleroma!302
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 3dd8ef284..d88a56adf 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -32,7 +32,8 @@ config :pleroma, Pleroma.Web.Endpoint,
protocol: "https",
secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
- pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2]
+ pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
+ secure_cookie_flag: true
# Configures Elixir's Logger
config :logger, :console,