logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 89fa14f5583b1465db1bad8c1fae2f7c436bf933
parent: e3534f5b3c68f9bf6a10c5fc10aa637ef66ab82e
Author: rinpatch <rinpatch@sdf.org>
Date:   Fri, 21 Jun 2019 22:43:39 +0000

Merge branch 'fix/use-config-when-possible' into 'develop'

use Config in generated config when available

See merge request pleroma/pleroma!1319

Diffstat:

Mpriv/templates/sample_config.eex6+++++-
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git 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 %>],