diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-21 22:43:39 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-21 22:43:39 +0000 |
| commit | 89fa14f5583b1465db1bad8c1fae2f7c436bf933 (patch) | |
| tree | 3ba92c4ed57e9fc35c7b6c7bf9fc85b2d7302caf | |
| parent | e3534f5b3c68f9bf6a10c5fc10aa637ef66ab82e (diff) | |
| parent | 960d6b54e8575b828d34fcf0b69e634dc4d33fe0 (diff) | |
| download | pleroma-89fa14f5583b1465db1bad8c1fae2f7c436bf933.tar.gz pleroma-89fa14f5583b1465db1bad8c1fae2f7c436bf933.zip | |
Merge branch 'fix/use-config-when-possible' into 'develop'
use Config in generated config when available
See merge request pleroma/pleroma!1319
| -rw-r--r-- | priv/templates/sample_config.eex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/priv/templates/sample_config.eex b/priv/templates/sample_config.eex index 8b45acb05..526593d0a 100644 --- a/priv/templates/sample_config.eex +++ b/priv/templates/sample_config.eex @@ -3,7 +3,11 @@ # NOTE: This file should not be committed to a repo or otherwise made public # without removing sensitive information. -use Mix.Config +<%= if Code.ensure_loaded?(Config) do + "import Config" +else + "use Mix.Config" +end %> config :pleroma, Pleroma.Web.Endpoint, url: [host: "<%= domain %>", scheme: "https", port: <%= port %>], |