summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-06-10 13:03:48 +0000
committerlain <lain@soykaf.club>2019-06-10 13:03:48 +0000
commit8fd68b8039c81a4e7b6dd1232c32fa2e736b1ea2 (patch)
tree1dc9bc9e0e0e0f5ae894a9c75ae3ca45bef49808 /config
parent3d7bb4712436ca80b840b35c39674e2f951cecbe (diff)
parentdbe4c2b7c8cfec4d8348de869a86c03015a7b7c5 (diff)
downloadpleroma-8fd68b8039c81a4e7b6dd1232c32fa2e736b1ea2.tar.gz
pleroma-8fd68b8039c81a4e7b6dd1232c32fa2e736b1ea2.zip
Merge branch 'feature/releases' into 'develop'
Releases See merge request pleroma/pleroma!1261
Diffstat (limited to 'config')
-rw-r--r--config/prod.exs2
-rw-r--r--config/releases.exs1
2 files changed, 3 insertions, 0 deletions
diff --git a/config/prod.exs b/config/prod.exs
index 1179cf3b0..bf1a97de0 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -17,6 +17,8 @@ config :pleroma, Pleroma.Web.Endpoint,
http: [port: 4000],
protocol: "http"
+config :phoenix, serve_endpoints: true
+
# Do not print debug messages in production
config :logger, level: :warn
diff --git a/config/releases.exs b/config/releases.exs
new file mode 100644
index 000000000..becde7693
--- /dev/null
+++ b/config/releases.exs
@@ -0,0 +1 @@
+import Config