bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/develop' into delete-pleroma-fe

Browse source
This commit is contained in:
Alex Gleason 2022-08-13 13:27:25 -05:00
commit e1689cb323
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/docker.exs
View file

@ -5,7 +5,7 @@
http: [ip: {0, 0, 0, 0}, port: System.get_env("PORT", "5000")]
config :pleroma, :instance,
name: System.get_env("INSTANCE_NAME", "Pleroma"),
name: System.get_env("INSTANCE_NAME", "Soapbox"),
email: System.get_env("ADMIN_EMAIL"),
notify_email: System.get_env("NOTIFY_EMAIL"),
limit: 5000,
@ -20,7 +20,7 @@
_ ->
config :pleroma, Pleroma.Repo,
username: System.get_env("DB_USER", "postgres"),
password: System.fetch_env!("DB_PASS", "postgres"),
password: System.get_env("DB_PASS", "postgres"),
database: System.get_env("DB_NAME", "postgres"),
hostname: System.get_env("DB_HOST", "db")
end