Merge pull request #377 from Lupul/Hotfix-0620

Setup webmail config only when imap/dovecot is installed

bin/v-add-mail-domain

@@ -108,7 +108,9 @@ if [[ "$MAIL_SYSTEM" =~ exim ]]; then
 
     # Set ownership
     chown -R $MAIL_USER:mail $HOMEDIR/$user/conf/mail/$domain
-    chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+    if [ "$IMAP_SYSTEM" = 'dovecot' ]; then
+        chown -R dovecot:mail $HOMEDIR/$user/conf/mail/$domain/passwd
+    fi
     chown $user:mail $HOMEDIR/$user/mail/$domain_idn
 fi
 
@@ -129,7 +131,9 @@ fi
 
 # Add webmail configuration to mail domain
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
-    $BIN/v-add-webmail $user $domain '' 
+    if [ ! -z "$IMAP_SYSTEM" ]; then
+        $BIN/v-add-webmail $user $domain ''
+    fi
 fi
     
 #----------------------------------------------------------#

bin/v-add-webmail

@@ -45,6 +45,7 @@ check_args '2' "$#" 'USER DOMAIN [RESTART]'
 is_format_valid 'user' 'domain'
 is_system_enabled "$MAIL_SYSTEM" 'MAIL_SYSTEM'
 is_system_enabled "$WEB_SYSTEM" 'WEB_SYSTEM'
+is_system_enabled "$IMAP_SYSTEM" 'IMAP_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_unsuspended 'user' 'USER' "$user"
 is_object_valid 'mail' 'DOMAIN' "$domain"

bin/v-rebuild-mail-domain

@@ -45,8 +45,10 @@ rebuild_mail_domain_conf
 
 # Rebuild webmail configuration
 if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
-    $BIN/v-delete-webmail $user $domain ''
-    $BIN/v-add-webmail $user $domain ''
+    if [ ! -z "$IMAP_SYSTEM" ]; then
+        $BIN/v-delete-webmail $user $domain ''
+        $BIN/v-add-webmail $user $domain ''
+    fi
 fi
 
 #----------------------------------------------------------#

bin/v-rebuild-mail-domains

@@ -49,8 +49,10 @@ U_DISK_MAIL=0
 for domain in $(search_objects 'mail' 'SUSPENDED' "*" 'DOMAIN'); do
     rebuild_mail_domain_conf
     if [ ! -z "$WEB_SYSTEM" ] || [ ! -z "$PROXY_SYSTEM" ]; then
-        $BIN/v-delete-webmail $user $domain ''
-        $BIN/v-add-webmail $user $domain ''
+        if [ ! -z "$IMAP_SYSTEM" ]; then
+            $BIN/v-delete-webmail $user $domain ''
+            $BIN/v-add-webmail $user $domain ''
+        fi
     fi
 done
 

bin/v-unsuspend-mail-domain

@@ -56,8 +56,9 @@ sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/mail/$domain.conf
 decrease_user_value "$user" '$SUSPENDED_MAIL'
 
 # Enable webmail access
-$BIN/v-add-webmail $user $domain 'yes'
-
+if [ ! -z "$IMAP_SYSTEM" ]; then
+    $BIN/v-add-webmail $user $domain 'yes'
+fi
 # Logging
 log_event "$OK" "$ARGUMENTS"