From 78381d2e141f37c7fb4ca5d3eb33d50d97e330aa Mon Sep 17 00:00:00 2001
From: "Antonio J. Delgado" <ad@susurrando.com>
Date: Sat, 19 Nov 2022 23:25:33 +0200
Subject: [PATCH] update database

---
 tasks/docker/docker.yml   | 1 +
 templates/database.env.j2 | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tasks/docker/docker.yml b/tasks/docker/docker.yml
index efae84c..64f413a 100644
--- a/tasks/docker/docker.yml
+++ b/tasks/docker/docker.yml
@@ -189,6 +189,7 @@
     name: mastodon_postgresql_1
     state: started
 
+# CREATE USER mastodon CREATEDB;
 - name: Set up database
   shell: "docker-compose -f '{{ mastodon_composer_folder }}/docker-compose.yml' run --rm shell bundle exec rake db:setup && echo 'Database ready' > /var/lib/mastodon_db_setup"
   args:
diff --git a/templates/database.env.j2 b/templates/database.env.j2
index ddbcf74..7347080 100644
--- a/templates/database.env.j2
+++ b/templates/database.env.j2
@@ -1,7 +1,7 @@
 # postgresql configuration
-POSTGRES_USER=mastodon
-POSTGRES_DB=mastodon_production
-POSTGRES_PASSWORD=O6lOD6nF2LbhhJs1e7QL
+POSTGRES_USER={{ mastodon_db_user }}
+POSTGRES_DB={{ mastodon_db }}
+POSTGRES_PASSWORD={{ mastodon_db_password }}
 
 # pgbouncer configuration
 #POOL_MODE=transaction