nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
use Config in generated config when available

See merge request pleroma/pleroma!1319
This commit is contained in:
rinpatch 2019-06-21 22:43:39 +00:00
parent e3534f5b3c 960d6b54e8
commit 89fa14f558
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
priv/templates/sample_config.eex
View file

@ -3,7 +3,11 @@
# NOTE: This file should not be committed to a repo or otherwise made public # NOTE: This file should not be committed to a repo or otherwise made public
# without removing sensitive information. # 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, config :pleroma, Pleroma.Web.Endpoint,
url: [host: "<%= domain %>", scheme: "https", port: <%= port %>], url: [host: "<%= domain %>", scheme: "https", port: <%= port %>],