From ddf49610bf05c976b5b5e20848d3d986a235c50f Mon Sep 17 00:00:00 2001 From: gau1991 Date: Mon, 28 Jul 2014 18:58:28 +0530 Subject: [PATCH] Logs goto $EE_COMMAND_LOG --- src/modules/stack/install/mail/ee_mod_setup_dovecot.sh | 6 +++--- src/modules/stack/install/mail/ee_mod_setup_postfix.sh | 8 ++++---- src/vendor/ee_ven_install_roundcube.sh | 2 +- src/vendor/ee_ven_install_vimbadmin.sh | 4 ++-- src/vendor/ee_ven_setup_roundcube.sh | 2 +- src/vendor/ee_ven_setup_vimbadmin.sh | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/modules/stack/install/mail/ee_mod_setup_dovecot.sh b/src/modules/stack/install/mail/ee_mod_setup_dovecot.sh index 387209cf..ca77fc4a 100644 --- a/src/modules/stack/install/mail/ee_mod_setup_dovecot.sh +++ b/src/modules/stack/install/mail/ee_mod_setup_dovecot.sh @@ -23,7 +23,7 @@ function ee_mod_setup_dovecot() || ee_lib_error "Unable to setup 10-auth.conf file, exit status = " $? # Configuring dovecot-sql.conf.ext - cp -v /usr/share/easyengine/mail/dovecot-sql.conf.ext /etc/dovecot/dovecot-sql.conf.ext \ + cp -v /usr/share/easyengine/mail/dovecot-sql.conf.ext /etc/dovecot/dovecot-sql.conf.ext &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to copy dovecot-sql.conf.ext, exit status = " $? # Configuring auth-sql.conf.ext @@ -32,8 +32,8 @@ function ee_mod_setup_dovecot() # Configuring 10-master.conf - cp -v /etc/dovecot/conf.d/10-master.conf /etc/dovecot/conf.d/10-master.conf.bak - cp -v /usr/share/easyengine/mail/10-master.conf /etc/dovecot/conf.d/10-master.conf \ + cp -v /etc/dovecot/conf.d/10-master.conf /etc/dovecot/conf.d/10-master.conf.bak &>> $EE_COMMAND_LOG + cp -v /usr/share/easyengine/mail/10-master.conf /etc/dovecot/conf.d/10-master.conf &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to setup 10-master.conf, exit status = " $? # Change Dovecot log location diff --git a/src/modules/stack/install/mail/ee_mod_setup_postfix.sh b/src/modules/stack/install/mail/ee_mod_setup_postfix.sh index 43eb9068..a8d19fa5 100644 --- a/src/modules/stack/install/mail/ee_mod_setup_postfix.sh +++ b/src/modules/stack/install/mail/ee_mod_setup_postfix.sh @@ -2,7 +2,7 @@ function ee_mod_setup_postfix() { - ee_lib_echo "Configuring Postfix, please wait..." + ee_lib_echo "Setting up Postfix, please wait..." #Configure Master.cf sed -i 's/#submission/submission/' /etc/postfix/master.cf && sed -i 's/#smtps/smtps/' /etc/postfix/master.cf \ @@ -38,9 +38,9 @@ function ee_mod_setup_postfix() # Setting up Postfix MySQL configuration mkdir -p /etc/postfix/mysql - cp -av /usr/share/easyengine/mail/virtual_alias_maps.cf /etc/postfix/mysql/virtual_alias_maps.cf && \ - cp -av /usr/share/easyengine/mail/virtual_domains_maps.cf /etc/postfix/mysql/virtual_domains_maps.cf && \ - cp -av /usr/share/easyengine/mail/virtual_mailbox_maps.cf /etc/postfix/mysql/virtual_mailbox_maps.cf \ + cp -av /usr/share/easyengine/mail/virtual_alias_maps.cf /etc/postfix/mysql/virtual_alias_maps.cf &>> $EE_COMMAND_LOG && \ + cp -av /usr/share/easyengine/mail/virtual_domains_maps.cf /etc/postfix/mysql/virtual_domains_maps.cf &>> $EE_COMMAND_LOG && \ + cp -av /usr/share/easyengine/mail/virtual_mailbox_maps.cf /etc/postfix/mysql/virtual_mailbox_maps.cf &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to copy Postfix MySQL configuration files, exit status = " $? } diff --git a/src/vendor/ee_ven_install_roundcube.sh b/src/vendor/ee_ven_install_roundcube.sh index b6a0cf24..1bafe87e 100644 --- a/src/vendor/ee_ven_install_roundcube.sh +++ b/src/vendor/ee_ven_install_roundcube.sh @@ -6,7 +6,7 @@ function ee_ven_install_roundcube() ee_lib_echo "Installing Roundcube dependencies, 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 \ + pear install Mail_Mime Net_SMTP Mail_mimeDecode Net_IDNA2-beta Auth_SASL Net_Sieve Crypt_GPG &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to install pear packages, exit status = " $? # Setup Roundcube directory diff --git a/src/vendor/ee_ven_install_vimbadmin.sh b/src/vendor/ee_ven_install_vimbadmin.sh index 892839f4..8055ee9d 100644 --- a/src/vendor/ee_ven_install_vimbadmin.sh +++ b/src/vendor/ee_ven_install_vimbadmin.sh @@ -13,9 +13,9 @@ function ee_ven_install_vimbadmin() # Install Composer cd /var/www/22222/htdocs/vimbadmin - curl -sS https://getcomposer.org/installer | php \ + curl -sS https://getcomposer.org/installer | php &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to install Composer, exit status = " $? - php composer.phar install --prefer-dist --no-dev \ + php composer.phar install --prefer-dist --no-dev &>> $EE_COMMAND_LOG \ || ee_lib_error "Unable to install ViMbAdmin, exit status = " $? # Fix permissions diff --git a/src/vendor/ee_ven_setup_roundcube.sh b/src/vendor/ee_ven_setup_roundcube.sh index 77290d9f..620f79c6 100644 --- a/src/vendor/ee_ven_setup_roundcube.sh +++ b/src/vendor/ee_ven_setup_roundcube.sh @@ -21,7 +21,7 @@ function ee_ven_setup_roundcube() || ee_lib_error "Unable to import database for Roundcube, exit status = " $? # Setup configuration for Roundcube - cp -av /var/www/roundcubemail/htdocs/config/config.inc.php.sample /var/www/roundcubemail/htdocs/config/config.inc.php + cp -av /var/www/roundcubemail/htdocs/config/config.inc.php.sample /var/www/roundcubemail/htdocs/config/config.inc.php &>> $EE_COMMAND_LOG sed -i "s'mysql://roundcube:pass@localhost/roundcubemail'mysql://roundcube:${ee_random}@${EE_MYSQL_HOST}/roundcubemail'" /var/www/roundcubemail/htdocs/config/config.inc.php \ || ee_lib_error "Unable to setup Roundcube database details in config.inc.php file, exit status = " $? diff --git a/src/vendor/ee_ven_setup_vimbadmin.sh b/src/vendor/ee_ven_setup_vimbadmin.sh index c082d6a6..de307cc6 100644 --- a/src/vendor/ee_ven_setup_vimbadmin.sh +++ b/src/vendor/ee_ven_setup_vimbadmin.sh @@ -17,7 +17,7 @@ function ee_ven_setup_vimbadmin() mysql -e "flush privileges" # Setup configuration for ViMbAdmin - cp -av /var/www/22222/htdocs/vimbadmin/application/configs/application.ini.dist /var/www/22222/htdocs/vimbadmin/application/configs/application.ini + cp -av /var/www/22222/htdocs/vimbadmin/application/configs/application.ini.dist /var/www/22222/htdocs/vimbadmin/application/configs/application.ini &>> $EE_COMMAND_LOG sed -i "s/defaults.mailbox.uid = 2000/defaults.mailbox.uid = 5000/" /var/www/22222/htdocs/vimbadmin/application/configs/application.ini && sed -i "s/defaults.mailbox.gid = 2000/defaults.mailbox.gid = 5000/" /var/www/22222/htdocs/vimbadmin/application/configs/application.ini &&