Updated for latest pleroma version.

2 files changed, 3 insertions, 13 deletions

diff --git a/roles/pleroma/tasks/main.yaml b/roles/pleroma/tasks/main.yaml
index fa02320..ba3af9e 100644
--- a/roles/pleroma/tasks/main.yaml
+++ b/roles/pleroma/tasks/main.yaml
@@ -34,14 +34,6 @@
     dest: "~{{pleroma_user}}/pleroma"
     force: yes
 
-- name: update elixir dep
-  become: yes
-  become_user: "{{pleroma_user}}"
-  lineinfile:
-    path: "~{{pleroma_user}}/pleroma/mix.exs"
-    regexp: 'elixir: "~> 1.4",$'
-    line: 'elixir: "~> 1.7",'
-
 - name: install pleroma config files
   template:
     src: "{{item}}.j2"
diff --git a/roles/pleroma/templates/setup_db.psql.j2 b/roles/pleroma/templates/setup_db.psql.j2
index de390c0..0b4a87c 100644
--- a/roles/pleroma/templates/setup_db.psql.j2
+++ b/roles/pleroma/templates/setup_db.psql.j2
@@ -1,9 +1,7 @@
-CREATE USER {{pleroma_user}} WITH ENCRYPTED PASSWORD '{{pleroma_db_passwd}}' CREATEDB;
--- in case someone runs this second time accidentally
-ALTER USER {{pleroma_user}} WITH ENCRYPTED PASSWORD '{{pleroma_db_passwd}}' CREATEDB;
-CREATE DATABASE {{pleroma_user}};
-ALTER DATABASE {{pleroma_user}} OWNER TO {{pleroma_user}};
+CREATE USER {{pleroma_user}} WITH ENCRYPTED PASSWORD '{{pleroma_db_passwd}}';
+CREATE DATABASE {{pleroma_user}} OWNER {{pleroma_user}};
 \c {{pleroma_user}};
 --Extensions made by ecto.migrate that need superuser access
 CREATE EXTENSION IF NOT EXISTS citext;
 CREATE EXTENSION IF NOT EXISTS pg_trgm;
+CREATE EXTENSION IF NOT EXISTS "uuid-ossp";