From 729b9d4ec9a942f193a4303552c39c182a627d18 Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Thu, 26 Sep 2013 22:50:34 +0300
Subject: [PATCH] groupdel admin

---
 install/vst-install.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/install/vst-install.sh b/install/vst-install.sh
index 202f25a7..c52e02d2 100644
--- a/install/vst-install.sh
+++ b/install/vst-install.sh
@@ -609,9 +609,8 @@ if [ "$srv_type" = 'medium' ] ||  [ "$srv_type" = 'large' ]; then
     service clamd start
     if [ "$?" -ne 0 ]; then
         echo "Error: clamd start failed"
-    exit 1
-fi
-
+        exit 1
+    fi
 fi
 
 # SpamAssassin configuration
@@ -620,9 +619,8 @@ if [ "$srv_type" = 'medium' ] ||  [ "$srv_type" = 'large' ]; then
     service spamassassin start
     if [ "$?" -ne 0 ]; then
         echo "Error: spamassassin start failed"
-    exit 1
-fi
-
+        exit 1
+    fi
 fi
 
 # php configuration
@@ -719,6 +717,9 @@ if [ ! -z "$(grep ^admin: /etc/passwd)" ] && [ "$force" = 'yes' ]; then
     mv -f /home/admin  $vst_backups/home/
     rm -f /tmp/sess_*
 fi
+if [ ! -z "$(grep ^admin: /etc/group)" ] && [ "$force" = 'yes' ]; then
+    groupdel admin > /dev/null 2>&1
+fi
 vpass=$(gen_pass)
 $VESTA/bin/v-add-user admin $vpass $email default System Administrator
 if [ $? -ne 0 ]; then