diff --git a/bin/easyengine b/bin/easyengine index 52af6e39..cfe14e46 100644 --- a/bin/easyengine +++ b/bin/easyengine @@ -138,7 +138,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then && mysqladmin ping &> /dev/null \ && dpkg --get-selections | grep -v deinstall | grep postfix > /dev/null if [ $? -ne 0 ];then - ee_lib_error "Failed to find pre dependencies.\nPlease install Nginx, PHP5, MySQL and Postfix using command ee stack install, exit status " 1 + ee_lib_error "Failed to find NGINX PHP MySQL Postfix, exit status=" 1 fi dpkg --get-selections | grep -v deinstall | grep dovecot-core > /dev/null @@ -149,15 +149,15 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then # Install Dovecot ee_mod_install_dovecot + # Install mail scanner packages + ee_mod_install_mailscan + # Install ViMbAdmin ee_ven_install_vimbadmin # Install Roundcube ee_ven_install_roundcube - # Install mail scanner packages - ee_mod_install_mailscan - # Configure PostFix ee_mod_setup_postfix @@ -173,7 +173,7 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then # Setup Roundcube ee_ven_setup_roundcube - # Setup Sieve + # Setup Sieve Rules ee_mod_setup_sieve ee_lib_service nginx postfix dovecot amavis restart @@ -234,15 +234,15 @@ elif [ "$EE_FIRST" = "stack" ] || [ "$EE_FIRST" = "system" ]; then # Remove Dovecot ee_mod_remove_dovecot + # Remove Amavis + ee_mod_remove_mailscan + # Remove ViMbAdmin ee_ven_remove_vimbadmin # Remove Roundcube ee_ven_remove_roundcube - # Remove Amavis - ee_mod_remove_mailscan - # Execute: apt-get autoremove ee_lib_autoremove diff --git a/src/modules/stack/install/mail/ee_mod_setup_sieve.sh b/src/modules/stack/install/mail/ee_mod_setup_sieve.sh index 35d2b561..40cf3889 100644 --- a/src/modules/stack/install/mail/ee_mod_setup_sieve.sh +++ b/src/modules/stack/install/mail/ee_mod_setup_sieve.sh @@ -1,4 +1,4 @@ -# Setup Sieve +# Setup Sieve rules function ee_mod_setup_sieve() { @@ -7,7 +7,7 @@ function ee_mod_setup_sieve() EE_EMAIL=$(git config user.email) fi - ee_lib_echo "Setting up Sieve, please wait..." + ee_lib_echo "Setting up Sieve rules, please wait..." # Enable sieve plugin support for dovecot-lmtp sed -i "s' #mail_plugins = \$mail_plugins' postmaster_address =$EE_EMAIL \n mail_plugins = \$mail_plugins sieve'" /etc/dovecot/conf.d/20-lmtp.conf \ diff --git a/src/vendor/ee_ven_install_roundcube.sh b/src/vendor/ee_ven_install_roundcube.sh index 9424545b..03e65f02 100644 --- a/src/vendor/ee_ven_install_roundcube.sh +++ b/src/vendor/ee_ven_install_roundcube.sh @@ -3,7 +3,7 @@ function ee_ven_install_roundcube() { # Install Roundcube dependencies - ee_lib_echo "Installing Roundcube dependencies, please wait..." + ee_lib_echo "Installing Roundcube, please wait..." $EE_APT_GET install php-pear \ || ee_lib_error "Unable to install php-pear, exit status = " $? pear install Mail_Mime Net_SMTP Mail_mimeDecode Net_IDNA2-beta Auth_SASL Net_Sieve Crypt_GPG &>> $EE_COMMAND_LOG \ @@ -15,11 +15,9 @@ function ee_ven_install_roundcube() ee_lib_symbolic_link /var/log/nginx/roundcubemail.error.log /var/www/roundcubemail/logs/error.log # Install Roundcube - ee_lib_echo "Downloading Roundcube, please wait..." wget -cqO /var/www/roundcube.tar.gz https://github.com/roundcube/roundcubemail/releases/download/${EE_ROUNDCUBE_VERSION}/roundcubemail-${EE_ROUNDCUBE_VERSION}.tar.gz \ || ee_lib_error "Unable to download Roundcube, exit status = " $? - ee_lib_echo "Installing Roundcube, please wait..." tar -zxf /var/www/roundcube.tar.gz -C /var/www/roundcubemail/htdocs/ --strip-components=1 \ || ee_lib_error "Unable to extract Roundcube, exit status = " $? diff --git a/src/vendor/ee_ven_install_vimbadmin.sh b/src/vendor/ee_ven_install_vimbadmin.sh index 6c0ed857..4f1d23a9 100644 --- a/src/vendor/ee_ven_install_vimbadmin.sh +++ b/src/vendor/ee_ven_install_vimbadmin.sh @@ -4,13 +4,13 @@ function ee_ven_install_vimbadmin() { # Install needed PHP5 libraries for ViMbAdmin - ee_lib_echo "Installing PHP5 libraries for ViMbAdmin, please wait..." # 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 - ee_lib_echo "Downloading ViMbAdmin, please wait..." + ee_lib_echo "Installing ViMbAdmin, please wait..." + ee_lib_echo "It will take nearly 10-20 minutes, please wait..." wget -cqO /var/www/22222/htdocs/vimbadmin.tar.gz https://github.com/opensolutions/ViMbAdmin/archive/${EE_VIMBADMIN_VERSION}.tar.gz \ || ee_lib_error "Unable to download ViMbAdmin, exit status = " $? @@ -18,8 +18,6 @@ function ee_ven_install_vimbadmin() tar --strip-components=1 -zxf /var/www/22222/htdocs/vimbadmin.tar.gz -C /var/www/22222/htdocs/vimbadmin # Install Composer - ee_lib_echo "Installing ViMbAdmin, please wait..." - ee_lib_echo "It will take nearly 10-20 minutes, please wait..." cd /var/www/22222/htdocs/vimbadmin curl -sS https://getcomposer.org/installer | php &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to install Composer, exit status = " $? diff --git a/src/vendor/ee_ven_setup_roundcube.sh b/src/vendor/ee_ven_setup_roundcube.sh index 2ea51517..0af6c635 100644 --- a/src/vendor/ee_ven_setup_roundcube.sh +++ b/src/vendor/ee_ven_setup_roundcube.sh @@ -2,7 +2,7 @@ function ee_ven_setup_roundcube() { - ee_lib_echo "configuring Roundcube, please wait..." + ee_lib_echo "Setting up Roundcube, please wait..." # Random characters local ee_random=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 15 | head -n1) diff --git a/src/vendor/ee_ven_setup_vimbadmin.sh b/src/vendor/ee_ven_setup_vimbadmin.sh index 10a97b51..c87cce5e 100644 --- a/src/vendor/ee_ven_setup_vimbadmin.sh +++ b/src/vendor/ee_ven_setup_vimbadmin.sh @@ -8,7 +8,7 @@ function ee_ven_setup_vimbadmin() ee_vimbadmin_host=$EE_MYSQL_HOST fi - ee_lib_echo "configuring ViMbAdmin, please wait..." + ee_lib_echo "Setting up ViMbAdmin, please wait..." # Random characters local ee_random=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 15 | head -n1)