Browse Source

Drop the database and its owner

Bob Mottram 7 years ago
parent
commit
b6ea8db5c6
2 changed files with 5 additions and 1 deletions
  1. 1
    1
      src/freedombone-app-peertube
  2. 4
    0
      src/freedombone-utils-postgresql

+ 1
- 1
src/freedombone-app-peertube View File

@@ -342,7 +342,7 @@ function remove_peertube {
342 342
     sed -i '/peertube/d' $COMPLETION_FILE
343 343
 
344 344
     function_check drop_database_postgresql
345
-    drop_database_postgresql peertube
345
+    drop_database_postgresql peertube peertube
346 346
 
347 347
     remove_postgresql_user peertube
348 348
     groupdel -f peertube

+ 4
- 0
src/freedombone-utils-postgresql View File

@@ -124,8 +124,12 @@ function remove_postgresql_user {
124 124
 
125 125
 function drop_database_postgresql {
126 126
     database_name="$1"
127
+    database_owner_name="$2"
127 128
     cd /etc/postgresql
128 129
     sudo -u postgres psql -c "drop database $database_name"
130
+    if [ ${#database_owner_name} -gt 0 ]; then
131
+        sudo -u postgres psql -c "drop user $database_owner_name"
132
+    fi
129 133
 }
130 134
 
131 135
 function run_system_query_postgresql {