Updated for external DB.

3 files changed, 8 insertions, 3 deletions

diff --git a/roles/pleroma/defaults/main.yaml b/roles/pleroma/defaults/main.yaml
index 2ab59a5..94c39a1 100644
--- a/roles/pleroma/defaults/main.yaml
+++ b/roles/pleroma/defaults/main.yaml
@@ -10,3 +10,4 @@ pleroma_admin_email: "admin@{{pleroma_host}}"
 pleroma_char_limit: 5000
 pleroma_signup_open: "true"
 pleroma_db_host: "localhost"
+pleroma_db_superuser: "postgres"
diff --git a/roles/pleroma/tasks/main.yaml b/roles/pleroma/tasks/main.yaml
index 47a62cf..9d1a746 100644
--- a/roles/pleroma/tasks/main.yaml
+++ b/roles/pleroma/tasks/main.yaml
@@ -50,9 +50,12 @@
 
 - name: install pleroma psql
   become: yes
-  become_user: "postgres"
-  command: "psql -f ~{{pleroma_user}}/pleroma/config/setup_db.psql"
+  become_user: "{{pleroma_db_superuser}}"
+  command: "psql -f ~{{pleroma_user}}/pleroma/config/setup_db.psql -h {{pleroma_db_host}}"
   notify: restart pleroma
+  environment:
+    PGUSER: "{{pleroma_db_superuser}}"
+    PGPASSWORD: "{{pleroma_db_superpass}}"
 
 - name: migrate db
   become: yes
diff --git a/roles/pleroma/templates/setup_db.psql.j2 b/roles/pleroma/templates/setup_db.psql.j2
index 0b4a87c..459bec8 100644
--- a/roles/pleroma/templates/setup_db.psql.j2
+++ b/roles/pleroma/templates/setup_db.psql.j2
@@ -1,5 +1,6 @@
 CREATE USER {{pleroma_user}} WITH ENCRYPTED PASSWORD '{{pleroma_db_passwd}}';
-CREATE DATABASE {{pleroma_user}} OWNER {{pleroma_user}};
+CREATE DATABASE {{pleroma_user}};
+ALTER DATABASE {{pleroma_user}} OWNER TO {{pleroma_user}};
 \c {{pleroma_user}};
 --Extensions made by ecto.migrate that need superuser access
 CREATE EXTENSION IF NOT EXISTS citext;