Merge branch 'feature/bbs' into 'develop'

[akkoma] / lib / mix / tasks / pleroma / sample_psql.eex

diff --git a/lib/mix/tasks/pleroma/sample_psql.eex b/lib/mix/tasks/pleroma/sample_psql.eex
index 66f76752fb42f11b046706e8fd0922f61bf33c95..f0ac05e5702bee70891f03b29d62e204e069aed8 100644 (file)
--- a/lib/mix/tasks/pleroma/sample_psql.eex
+++ b/lib/mix/tasks/pleroma/sample_psql.eex
@@ -1,9 +1,7 @@
-CREATE USER <%= dbuser %> WITH ENCRYPTED PASSWORD '<%= dbpass %>' CREATEDB;
--- in case someone runs this second time accidentally
-ALTER USER <%= dbuser %> WITH ENCRYPTED PASSWORD '<%= dbpass %>' CREATEDB;
-CREATE DATABASE <%= dbname %>;
-ALTER DATABASE <%= dbname %> OWNER TO <%= dbuser %>;
+CREATE USER <%= dbuser %> WITH ENCRYPTED PASSWORD '<%= dbpass %>';
+CREATE DATABASE <%= dbname %> OWNER <%= dbuser %>;
 \c <%= dbname %>;
 --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";