squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run mix format

Browse Source
This commit is contained in:
Ashlynn Anderson 2019-08-03 13:42:57 -04:00
parent 04327721d7
commit 4007717534
1 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/docker.exs
View File

@ -21,8 +21,7 @@ config :pleroma, Pleroma.Repo,
pool_size: 10
# Configure web push notifications
config :web_push_encryption, :vapid_details,
subject: "mailto:#{System.get_env("NOTIFY_EMAIL")}"
config :web_push_encryption, :vapid_details, subject: "mailto:#{System.get_env("NOTIFY_EMAIL")}"
config :pleroma, :database, rum_enabled: false
config :pleroma, :instance, static_dir: "/var/lib/pleroma/static"
@ -34,7 +33,8 @@ if not File.exists?("/var/lib/pleroma/secret.exs") do
signing_salt = :crypto.strong_rand_bytes(8) |> Base.encode64() |> binary_part(0, 8)
{web_push_public_key, web_push_private_key} = :crypto.generate_key(:ecdh, :prime256v1)
secret_file = EEx.eval_string(
secret_file =
EEx.eval_string(
"""
import Config
@ -60,7 +60,8 @@ import_config("/var/lib/pleroma/secret.exs")
# For additional user config
if File.exists?("/var/lib/pleroma/config.exs"),
do: import_config("/var/lib/pleroma/config.exs"),
else: File.write("/var/lib/pleroma/config.exs", """
else:
File.write("/var/lib/pleroma/config.exs", """
import Config
# For additional configuration outside of environmental variables