diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-20 22:25:35 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-20 22:25:35 +0000 |
| commit | a591a044a9c4e0bef1190d7895c8aba11a4cd476 (patch) | |
| tree | 79558efeda20b4fdff7a837af29fdcbd61dfe89f /config | |
| parent | c7d08bc1cf37417f8275839f493d09981f2f7e09 (diff) | |
| parent | bcecdc3ab194135d5bc17496b8091a6c17775c87 (diff) | |
| download | pleroma-a591a044a9c4e0bef1190d7895c8aba11a4cd476.tar.gz pleroma-a591a044a9c4e0bef1190d7895c8aba11a4cd476.zip | |
Merge branch 'runtime-fixes' into 'develop'
Various runtime configuration fixes
See merge request pleroma/pleroma!468
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/prod.exs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index af0fdca9a..faeac8ed1 100644 --- a/config/config.exs +++ b/config/config.exs @@ -52,6 +52,7 @@ config :pleroma, Pleroma.Web.Endpoint, url: [host: "localhost"], protocol: "https", 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], secure_cookie_flag: true diff --git a/config/prod.exs b/config/prod.exs index d0cfd1ac2..e5e5a977e 100644 --- a/config/prod.exs +++ b/config/prod.exs @@ -14,6 +14,7 @@ use Mix.Config # manifest is generated by the mix phoenix.digest task # which you typically run after static files are built. config :pleroma, Pleroma.Web.Endpoint, + server: true, http: [port: 4000], protocol: "http" |