# HG changeset patch # User Luke Hoersten # Date 1546293019 21600 # Node ID 652a236229c20889c1b28dd4da899609eac172db # Parent 4538ad03090612cb156f3c7d9978be49bd9e3ba3 Updated for external DB. diff -r 4538ad030906 -r 652a236229c2 roles/pleroma/defaults/main.yaml --- a/roles/pleroma/defaults/main.yaml Sun Dec 30 11:13:20 2018 -0600 +++ b/roles/pleroma/defaults/main.yaml Mon Dec 31 15:50:19 2018 -0600 @@ -10,3 +10,4 @@ pleroma_char_limit: 5000 pleroma_signup_open: "true" pleroma_db_host: "localhost" +pleroma_db_superuser: "postgres" diff -r 4538ad030906 -r 652a236229c2 roles/pleroma/tasks/main.yaml --- a/roles/pleroma/tasks/main.yaml Sun Dec 30 11:13:20 2018 -0600 +++ b/roles/pleroma/tasks/main.yaml Mon Dec 31 15:50:19 2018 -0600 @@ -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 -r 4538ad030906 -r 652a236229c2 roles/pleroma/templates/setup_db.psql.j2 --- a/roles/pleroma/templates/setup_db.psql.j2 Sun Dec 30 11:13:20 2018 -0600 +++ b/roles/pleroma/templates/setup_db.psql.j2 Mon Dec 31 15:50:19 2018 -0600 @@ -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;