From 7d6cadc0348e0828841cae8c3351a7c0519d41ba Mon Sep 17 00:00:00 2001
From: Serghey Rodin <serghey.rodin@gmail.com>
Date: Wed, 1 Jul 2015 01:34:54 +0300
Subject: [PATCH] chmod/touch/mkdir command consolidation

---
 bin/v-add-user | 71 +++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 42 deletions(-)

diff --git a/bin/v-add-user b/bin/v-add-user
index ec1596f77..09367c622 100755
--- a/bin/v-add-user
+++ b/bin/v-add-user
@@ -75,21 +75,15 @@ echo "$user:$password" | /usr/sbin/chpasswd
 mkdir $HOMEDIR/$user/conf
 
 if [ ! -z "$WEB_SYSTEM" ]; then
-    mkdir $HOMEDIR/$user/conf/web
-    mkdir $HOMEDIR/$user/web
-    mkdir $HOMEDIR/$user/tmp
-    chmod 751 $HOMEDIR/$user/conf/web
-    chmod 751 $HOMEDIR/$user/web
+    mkdir $HOMEDIR/$user/conf/web $HOMEDIR/$user/web $HOMEDIR/$user/tmp
+    chmod 751 $HOMEDIR/$user/conf/web $HOMEDIR/$user/web
     chmod 771 $HOMEDIR/$user/tmp
-    chown $user:$user $HOMEDIR/$user/web
-    chown $user:$user $HOMEDIR/$user/tmp
+    chown $user:$user $HOMEDIR/$user/web $HOMEDIR/$user/tmp
 fi
 
 if [ ! -z "$MAIL_SYSTEM" ]; then
-    mkdir $HOMEDIR/$user/conf/mail
-    mkdir $HOMEDIR/$user/mail
-    chmod 751 $HOMEDIR/$user/mail
-    chmod 751 $HOMEDIR/$user/conf/mail
+    mkdir $HOMEDIR/$user/conf/mail $HOMEDIR/$user/mail
+    chmod 751 $HOMEDIR/$user/mail $HOMEDIR/$user/conf/mail
 fi
 
 if [ ! -z "$DNS_SYSTEM" ]; then
@@ -107,54 +101,47 @@ chattr +i $HOMEDIR/$user/conf
 #----------------------------------------------------------#
 
 # Adding user dir
-mkdir $USER_DATA
-chmod 770 $USER_DATA
+mkdir -p  $USER_DATA/ssl $USER_DATA/dns $USER_DATA/mail
 
 # Creating configuration files and pipes
-touch $USER_DATA/backup.conf
-chmod 660 $USER_DATA/backup.conf
-touch $USER_DATA/history.log
-chmod 660 $USER_DATA/history.log
-touch $USER_DATA/stats.log
-chmod 660 $USER_DATA/stats.log
+touch $USER_DATA/backup.conf \
+    $USER_DATA/history.log \
+    $USER_DATA/stats.log \
+    $USER_DATA/web.conf \
+    $USER_DATA/dns.conf \
+    $USER_DATA/mail.conf \
+    $USER_DATA/db.conf \
+    $USER_DATA/cron.conf
 
+chmod 770 $USER_DATA \
+    $USER_DATA/ssl \
+    $USER_DATA/dns \
+    $USER_DATA/mail
+
+chmod 660 $USER_DATA/backup.conf \
+    $USER_DATA/history.log \
+    $USER_DATA/stats.log \
+    $USER_DATA/web.conf \
+    $USER_DATA/dns.conf \
+    $USER_DATA/mail.conf \
+    $USER_DATA/db.conf \
+    $USER_DATA/cron.conf
+
+# Updating queue pipes
 echo "$BIN/v-update-user-disk $user" >> $VESTA/data/queue/disk.pipe
-
 if [ ! -z "$WEB_SYSTEM" ]; then
-    mkdir $USER_DATA/ssl
-    chmod 770 $USER_DATA/ssl
-    touch $USER_DATA/web.conf
-    chmod 660 $USER_DATA/web.conf
     echo "$BIN/v-update-web-domains-traff $user" \
         >> $VESTA/data/queue/traffic.pipe
     echo "$BIN/v-update-web-domains-disk $user" >> $VESTA/data/queue/disk.pipe
 fi
-
-if [ ! -z "$DNS_SYSTEM" ]; then
-    mkdir $USER_DATA/dns
-    chmod 770 $USER_DATA/dns
-    touch $USER_DATA/dns.conf
-    chmod 660 $USER_DATA/dns.conf
-fi
-
 if [ ! -z "$MAIL_SYSTEM" ]; then
-    mkdir $USER_DATA/mail
-    chmod 770 $USER_DATA/mail
-    touch $USER_DATA/mail.conf
-    chmod 660 $USER_DATA/mail.conf
     echo "$BIN/v-update-mail-domains-disk $user" >> $VESTA/data/queue/disk.pipe
 fi
 
 if [ ! -z "$DB_SYSTEM" ]; then
-    touch $USER_DATA/db.conf
-    chmod 660 $USER_DATA/db.conf
     echo "$BIN/v-update-databases-disk $user" >> $VESTA/data/queue/disk.pipe
 fi
 
-if [ ! -z "$CRON_SYSTEM" ]; then
-    touch $USER_DATA/cron.conf
-    chmod 660 $USER_DATA/cron.conf
-fi
 
 # Filling user config
 if [ "$user" != 'admin' ]; then