Added mail remove and purge commands

bin/easyengine

@@ -210,7 +210,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
 			elif [ "$EE_SECOND" = "purge" ];then
 				ee_lib_echo "$EE_THIRD successfully purged"
 			fi
-		elif [ "$EE_THIRD" = "" ]; then
+		elif [ "$EE_THIRD" = "" ] || [ "$EE_THIRD" = "--web" ] || [ "$EE_THIRD" = "--all" ]; then
 			# Remove/Purge  NGINX/PHP/MySQL/Postfix package
 			ee_mod_remove_nginx
 			ee_mod_remove_php
@@ -228,11 +228,35 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then
 
 			# Display success message
 			if [ "$EE_SECOND" = "remove" ];then
-				ee_lib_echo "Successfully removed all packages"
+				ee_lib_echo "Successfully removed web packages"
+			elif [ "$EE_SECOND" = "purge" ];then
+				ee_lib_echo "Successfully purged web packages"
+			fi
+		fi
+		if [ "$EE_THIRD" = "--all" ] || [ "$EE_THIRD" = "--mail"];then
+			# Remove Dovecot
+			ee_mod_remove_dovecot
+
+			# Remove ViMbAdmin
+			ee_ven_remove_vimbadmin
+
+			# Remove Roundcube
+			ee_ven_remove_roundcube
+
+			# Remove Amavis
+			ee_mod_remove_mailscan
+
+			# Remove Sieve
+			ee_mod_remove_sieve
+
+			# Display success message
+			if [ "$EE_SECOND" = "remove" ];then
+				ee_lib_echo "Successfully removed mail server packages"
 			elif [ "$EE_SECOND" = "purge" ];then
-				ee_lib_echo "Successfully purged all packages"
+				ee_lib_echo "Successfully purged mail server packages"
 			fi
 		fi
+
 	elif [ "$EE_SECOND" = "status" ]; then
 		ee_mod_stack_status
 	elif [ "$EE_SECOND" = "start" ] || [ "$EE_SECOND" = "stop" ] || [ "$EE_SECOND" = "reload" ] || [ "$EE_SECOND" = "restart" ]; then

src/modules/stack/remove/mail/ee_mod_remove_dovecot.sh

@@ -0,0 +1,9 @@
+# Remove Dovecot package
+
+function ee_mod_remove_dovecot()
+{
+	ee_lib_echo "$EE_SECOND Dovecot package, please wait..."
+	$EE_APT_GET $EE_SECOND dovecot-core dovecot-imapd dovecot-pop3d dovecot-lmtpd dovecot-mysql \
+	|| ee_lib_error "Unable to $EE_SECOND Dovecot, exit status = " $?
+
+}

src/modules/stack/remove/mail/ee_mod_remove_mailscan.sh

@@ -0,0 +1,9 @@
+# Remove MailScan package
+
+function ee_mod_remove_mysql()
+{
+	ee_lib_echo "$EE_SECOND Amavis, SpamAssassin and ClamAV package, please wait..."
+	$EE_APT_GET $EE_SECOND amavisd-new spamassassin clamav clamav-daemon arj zoo nomarch cpio lzop cabextract apt-listchanges libauthen-sasl-perl  libdbi-perl libmail-dkim-perl p7zip rpm unrar-free libsnmp-perl \
+	|| ee_lib_error "Unable to $EE_SECOND Amavis, SpamAssassin and ClamAV,, exit status = " $?
+
+}

src/modules/stack/remove/mail/ee_mode_remove_sieve.sh

@@ -0,0 +1,10 @@
+# Remove Sieve package
+
+function ee_mod_remove_sieve()
+{
+	ee_lib_echo "$EE_SECOND Sieve package, please wait..."
+	$EE_APT_GET $EE_SECOND dovecot-sieve dovecot-managesieved \
+	|| ee_lib_error "Unable to $EE_SECOND Sieve, exit status = " $?
+
+
+}

src/vendor/ee_ven_install_vimbadmin.sh

@@ -5,7 +5,8 @@ function ee_ven_install_vimbadmin()
 
 	# Install needed PHP5 libraries for ViMbAdmin
 	ee_lib_echo "Installing PHP5 libraries for ViMbAdmin, please wait..."
-	$EE_APT_GET install php5-cgi php5-mcrypt php5-memcache php5-json php5-mysqlnd php-gettext \
+	# ee stack install php installed php5-mcrypt, php5-memcache, php5-mysqlnd 
+	$EE_APT_GET install php5-cgi php5-json php-gettext \
 	|| ee_lib_error "Unable to install php-pear, exit status = " $?
 
 	# Install ViMbAdmin

src/vendor/ee_ven_remove_roundcube.sh

@@ -2,7 +2,20 @@
 
 function ee_ven_remove_roundcube()
 {
+	ee_lib_echo "Removing Roundcube dependencies, please wait..."
+	# Remove packages installed using Pear
+	pear uninstall Mail_Mime Net_SMTP Mail_mimeDecode Net_IDNA2-beta Auth_SASL Net_Sieve Crypt_GPG &>> $EE_COMMAND_LOG
+
+	# Remove Php-Pear
+	$EE_APT_GET $EE_SECOND php-pear \
+	||ee_lib_error "Unable to $EE_SECOND Roundcube PHP dependencies, exit status = " $?
+	
+	# Remove Roundcube
 	ee_lib_echo "Removing Roundcube, please wait..."
-	rm -rf /var/www/roundcubemail \
+
+	mysql -e "drop database \`roundcubemail\`" &>> $EE_COMMAND_LOG
+	mysql -e "drop user roundcube@'$EE_MYSQL_GRANT_HOST'" &>> $EE_COMMAND_LOG
+
+	rm -rf /var/www/roundcubemail /etc/nginx/sites-available/webmail /etc/nginx/sites-enabled/webmail \
 	|| ee_lib_error "Unable to remove Roundcube, exit status = " $?
 }

src/vendor/ee_ven_remove_vimbadmin.sh

@@ -3,6 +3,14 @@
 function ee_ven_remove_vimbadmin()
 {
 	ee_lib_echo "Removing ViMbAdmin, please wait..."
+
+	mysql -e "drop database \`vimbadmin\`" &>> $EE_COMMAND_LOG
+	mysql -e "drop user vimbadmin@'$EE_MYSQL_GRANT_HOST'" &>> $EE_COMMAND_LOG
+
+	ee_lib_echo "Removing ViMbAdmin PHP dependencies, please wait..."
+	$EE_APT_GET $EE_SECOND php5-cgi php5-json php-gettext \
+	||ee_lib_error "Unable to $EE_SECOND ViMbAdmin PHP dependencies, exit status = " $?
+
 	rm -rf /var/www/22222/htdocs/vimbadmin \
 	|| ee_lib_error "Unable to remove ViMbAdmin, exit status = " $?
 }