From: Rin Toshaka Date: Thu, 6 Dec 2018 17:11:22 +0000 (+0100) Subject: Merge develop X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=88f92693f25c34f8ab82d4ed809b266bf5fb9ff8;p=akkoma Merge develop --- 88f92693f25c34f8ab82d4ed809b266bf5fb9ff8 diff --cc lib/mix/tasks/pleroma/sample_config.eex index df9d1ad65,47b6be729..0cd572797 --- a/lib/mix/tasks/pleroma/sample_config.eex +++ b/lib/mix/tasks/pleroma/sample_config.eex @@@ -21,14 -16,21 +21,20 @@@ config :pleroma, :media_proxy redirect_on_failure: true #base_url: "https://cache.pleroma.social" -# Configure your database config :pleroma, Pleroma.Repo, adapter: Ecto.Adapters.Postgres, - username: "pleroma", + username: "<%= dbuser %>", password: "<%= dbpass %>", - database: "pleroma_dev", - hostname: "localhost", + database: "<%= dbname %>", + hostname: "<%= dbhost %>", pool_size: 10 + # Configure web push notifications + config :web_push_encryption, :vapid_details, + subject: "mailto:<%= email %>", + public_key: "<%= web_push_public_key %>", + private_key: "<%= web_push_private_key %>" + # Enable Strict-Transport-Security once SSL is working: # config :pleroma, :http_security, # sts: true