From 9f463c29b9671eb089566b19310f43091ef98a73 Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Sat, 2 Feb 2019 22:15:59 +0100
Subject: [PATCH] Fix pleroma database removal

---
 scripts/install | 2 +-
 scripts/remove  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/install b/scripts/install
index 9175aee..5e8ffc3 100755
--- a/scripts/install
+++ b/scripts/install
@@ -148,7 +148,7 @@ ynh_app_setting_set "$app" db_pwd "$db_pwd"
 ynh_psql_test_if_first_run
 ynh_psql_create_user "$app" "$db_pwd"
 ynh_psql_execute_as_root \
-"CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $app;"
+"CREATE DATABASE $db_name ENCODING 'UTF8' LC_COLLATE='C' LC_CTYPE='C' template=template0 OWNER $db_name;"
 ynh_psql_execute_as_root "\connect $db_name 
 CREATE EXTENSION IF NOT EXISTS unaccent;CREATE EXTENSION IF NOT EXISTS pg_trgm;"
 ynh_psql_execute_as_root "\connect $db_name 
diff --git a/scripts/remove b/scripts/remove
index 12753d1..e5c24ea 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -43,9 +43,12 @@ fi
 ynh_remove_systemd_config
 
 #=================================================
-# REMOVE THE MYSQL DATABASE
+# REMOVE THE POSTGRESQL DATABASE
 #=================================================
 
+ynh_psql_execute_as_root "\connect $db_name 
+SELECT pg_terminate_backend (pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname = '$db_name';"
+
 # Remove a database if it exists, along with the associated user
 ynh_psql_remove_db "$db_name" "$app"