summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJeff Becker <jeff@i2p.rocks>2018-01-24 13:15:54 -0500
committerJeff Becker <jeff@i2p.rocks>2018-01-24 13:15:54 -0500
commitdffde6631d105949b62c1ff27c22fefcb873b2e8 (patch)
treef486f66ae4067ec1bc0dec7f265765b6d35a9c58 /config
parent1e185b9301ec85cd2aaeb1faf075aaa86f733373 (diff)
parent0f722a8c223c1953c9c9fb45e73cc9ace92839e2 (diff)
downloadpleroma-dffde6631d105949b62c1ff27c22fefcb873b2e8.tar.gz
pleroma-dffde6631d105949b62c1ff27c22fefcb873b2e8.zip
Merge remote-tracking branch 'upstream/develop' into pr-upstream-http-proxy
Diffstat (limited to 'config')
-rw-r--r--config/prod.exs9
1 files changed, 6 insertions, 3 deletions
diff --git a/config/prod.exs b/config/prod.exs
index 732bab2b0..8522c67da 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -14,9 +14,12 @@ 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,
- on_init: {Pleroma.Web.Endpoint, :load_from_system_env, []},
- url: [host: "example.com", port: 80],
- cache_static_manifest: "priv/static/cache_manifest.json"
+ http: [port: 4000],
+ protocol: "http",
+ debug_errors: true,
+ code_reloader: true,
+ check_origin: false,
+ watchers: []
# Do not print debug messages in production
config :logger, level: :info