From 08f54aca198c4acbeed0b1336cd5fc0a7afaae48 Mon Sep 17 00:00:00 2001 From: Luke Hoersten Date: Sun, 17 Nov 2019 08:14:06 -0600 Subject: Pleroma role updates. Added Postgresql role. --- roles/pleroma/templates/prod.secret.exs.j2 | 4 +++- roles/pleroma/templates/setup_db.psql.j2 | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'roles/pleroma/templates') diff --git a/roles/pleroma/templates/prod.secret.exs.j2 b/roles/pleroma/templates/prod.secret.exs.j2 index 2c4d9f2..85b0bbb 100644 --- a/roles/pleroma/templates/prod.secret.exs.j2 +++ b/roles/pleroma/templates/prod.secret.exs.j2 @@ -27,4 +27,6 @@ config :pleroma, Pleroma.Repo, password: "{{pleroma_db_passwd}}", database: "{{pleroma_user}}", hostname: "{{pleroma_db_host}}", - pool_size: 10 + pool_size: 10, + timeout: 60000, + pool_timeout: 60000 diff --git a/roles/pleroma/templates/setup_db.psql.j2 b/roles/pleroma/templates/setup_db.psql.j2 index 459bec8..9a4af30 100644 --- a/roles/pleroma/templates/setup_db.psql.j2 +++ b/roles/pleroma/templates/setup_db.psql.j2 @@ -1,6 +1,5 @@ CREATE USER {{pleroma_user}} WITH ENCRYPTED PASSWORD '{{pleroma_db_passwd}}'; -CREATE DATABASE {{pleroma_user}}; -ALTER DATABASE {{pleroma_user}} OWNER TO {{pleroma_user}}; +CREATE DATABASE {{pleroma_user}} WITH OWNER {{pleroma_user}}; \c {{pleroma_user}}; --Extensions made by ecto.migrate that need superuser access CREATE EXTENSION IF NOT EXISTS citext; -- cgit v1.2.3