From 0d5bc8900a687ee67d9af991856ecc2bb486479b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 12 Jun 2017 11:33:54 +0100
Subject: [PATCH] Different user deletion commands

---
 src/freedombone-app-etherpad    |  5 ++---
 src/freedombone-app-ghost       |  5 ++---
 src/freedombone-app-gogs        |  5 ++---
 src/freedombone-app-mailpile    |  5 ++---
 src/freedombone-app-matrix      |  5 ++---
 src/freedombone-app-mediagoblin |  5 ++---
 src/freedombone-app-radicale    |  5 ++---
 src/freedombone-app-tahoelafs   | 10 ++++------
 src/freedombone-app-turtl       |  5 ++---
 9 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/freedombone-app-etherpad b/src/freedombone-app-etherpad
index b8f00100..bae73f39 100755
--- a/src/freedombone-app-etherpad
+++ b/src/freedombone-app-etherpad
@@ -434,9 +434,8 @@ function remove_etherpad {
     remove_backup_database_local etherpad
     remove_nodejs etherpad
 
-    sync
-    delgroup etherpad
-    deluser --remove-all-files etherpad
+    groupdel -f etherpad
+    userdel -r etherpad
 
     function_check remove_ddns_domain
     remove_ddns_domain $ETHERPAD_DOMAIN_NAME
diff --git a/src/freedombone-app-ghost b/src/freedombone-app-ghost
index bae7d6a1..a80bb91a 100755
--- a/src/freedombone-app-ghost
+++ b/src/freedombone-app-ghost
@@ -311,9 +311,8 @@ function remove_ghost {
     sed -i '/Ghost/d' $COMPLETION_FILE
     sed -i '/ghost/d' $COMPLETION_FILE
 
-    sync
-    delgroup ghost
-    deluser --remove-all-files ghost
+    groupdel -f ghost
+    userdel -r ghost
 
     function_check remove_ddns_domain
     remove_ddns_domain $GHOST_DOMAIN_NAME
diff --git a/src/freedombone-app-gogs b/src/freedombone-app-gogs
index d9b77a75..263bff71 100755
--- a/src/freedombone-app-gogs
+++ b/src/freedombone-app-gogs
@@ -374,9 +374,8 @@ function remove_gogs {
     sed -i '/gogs /d' $COMPLETION_FILE
     remove_backup_database_local gogs
 
-    sync
-    delgroup gogs
-    deluser --remove-all-files gogs
+    groupdel -f gogs
+    userdel -r gogs
 
     function_check remove_ddns_domain
     remove_ddns_domain $GIT_DOMAIN_NAME
diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index 141b1582..ffee0bc3 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -240,9 +240,8 @@ function remove_mailpile {
     function_check remove_ddns_domain
     remove_ddns_domain $MAILPILE_DOMAIN_NAME
 
-    sync
-    delgroup mailpile
-    deluser --remove-all-files mailpile
+    groupdel -f mailpile
+    userdel -r mailpile
 
     remove_config_param MAILPILE_DOMAIN_NAME
     remove_config_param MAILPILE_CODE
diff --git a/src/freedombone-app-matrix b/src/freedombone-app-matrix
index 6f36d45a..13b1f464 100755
--- a/src/freedombone-app-matrix
+++ b/src/freedombone-app-matrix
@@ -485,9 +485,8 @@ function remove_matrix {
     rm -rf $MATRIX_DATA_DIR
     rm -rf /etc/matrix
 
-    sync
-    delgroup matrix
-    deluser --remove-all-files matrix
+    groupdel -f matrix
+    userdel -r matrix
 
     remove_onion_service matrix ${MATRIX_ONION_PORT}
     remove_onion_service matrix ${MATRIX_FEDERATION_ONION_PORT}
diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index e301b006..3d1ab5af 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -253,9 +253,8 @@ function remove_mediagoblin {
 
     remove_nodejs mediagoblin
 
-    sync
-    delgroup mediagoblin
-    deluser --remove-all-files mediagoblin
+    groupdel -f mediagoblin
+    userdel -r mediagoblin
 
     function_check remove_ddns_domain
     remove_ddns_domain $MEDIAGOBLIN_DOMAIN_NAME
diff --git a/src/freedombone-app-radicale b/src/freedombone-app-radicale
index bf0c3d39..33952c5e 100755
--- a/src/freedombone-app-radicale
+++ b/src/freedombone-app-radicale
@@ -284,9 +284,8 @@ function remove_radicale {
 
     firewall_remove ${RADICALE_PORT} tcp
 
-    sync
-    delgroup radicale
-    deluser --remove-all-files radicale
+    groupdel -f radicale
+    userdel -r radicale
 
     function_check remove_onion_service
     remove_onion_service radicale ${RADICALE_ONION_PORT}
diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index 95f1538c..ff6e2a71 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -375,9 +375,8 @@ function remove_tahoelafs {
     remove_onion_service storage-tahoelafs ${TAHOELAFS_STORAGE_ONION_PORT} $(get_tahoelafs_nick)
     sed -i '/HidServAuth /d' /etc/tor/torrc
 
-    sync
-    delgroup tahoelafs
-    deluser --remove-all-files tahoelafs
+    groupdel -f tahoelafs
+    userdel -r tahoelafs
 
     if [ -d $TAHOE_DIR ]; then
         rm -rf $TAHOE_DIR
@@ -625,9 +624,8 @@ function install_tahoelafs {
     apt-get -yq install python-virtualenv apache2-utils
 
     if [ -d $TAHOE_DIR ]; then
-        sync
-        delgroup tahoelafs
-        deluser --remove-all-files tahoelafs
+        groupdel -f tahoelafs
+        userdel -r tahoelafs
         rm -rf $TAHOE_DIR
     fi
 
diff --git a/src/freedombone-app-turtl b/src/freedombone-app-turtl
index 6cdd0bdc..d593badc 100755
--- a/src/freedombone-app-turtl
+++ b/src/freedombone-app-turtl
@@ -370,9 +370,8 @@ function remove_turtl {
     rm -rf /var/lib/rethinkdb
     rm -rf $TURTL_BASE_DIR
 
-    sync
-    delgroup turtl
-    deluser --remove-all-files turtl
+    groupdel -f turtl
+    userdel -r turtl
 }