Commits

Zhang Huangbin committed 4b8184a

* Deliver administration mails before asking other post-installation questions.
* Update MD5/SHASUM info of re-packed iRedAPD-1.4.2.

Comments (0)

Files changed (4)

iRedMail/functions/cleanup.sh

         enable_service_rh sshd
     fi
 
-    [ X"${DISTRO}" == X"RHEL" ] && check_status_before_run cleanup_disable_selinux
-    [ X"${DISTRO}" != X'OPENBSD' ] && check_status_before_run cleanup_remove_sendmail
-    check_status_before_run cleanup_remove_mod_python
-    [ X"${KERNEL_NAME}" == X'LINUX' \
-        -o X"${KERNEL_NAME}" == X'OPENBSD' \
-        ] && check_status_before_run cleanup_replace_firewall_rules
-    [ X"${DISTRO}" == X"RHEL" ] && check_status_before_run cleanup_replace_mysql_config
-    check_status_before_run cleanup_backup_scripts
-    [ X"${BACKEND}" == X'PGSQL' ] && check_status_before_run cleanup_pgsql_force_password
-
     # Start Dovecot to deliver emails.
-    ECHO_INFO "Deliver administration emails to ${FIRST_USER}@${FIRST_DOMAIN}."
+    ECHO_INFO "Mail sensitive administration info to ${FIRST_USER}@${FIRST_DOMAIN}."
     [ X"${BACKEND}" == X'OPENLDAP' ] && ${DIR_RC_SCRIPTS}/${OPENLDAP_RC_SCRIPT_NAME} restart &>/dev/null
     [ X"${BACKEND}" == X'MYSQL' ] && ${DIR_RC_SCRIPTS}/${MYSQL_RC_SCRIPT_NAME} restart &>/dev/null
     [ X"${BACKEND}" == X'PGSQL' ] && ${DIR_RC_SCRIPTS}/${PGSQL_RC_SCRIPT_NAME} restart &>/dev/null
     ${DOVECOT_DELIVER} -c ${DOVECOT_CONF} -f root@${HOSTNAME} -d ${tip_recipient} < /tmp/.links.eml
     rm -f /tmp/.links.eml &>/dev/null
 
+    [ X"${DISTRO}" == X"RHEL" ] && check_status_before_run cleanup_disable_selinux
+    [ X"${DISTRO}" != X'OPENBSD' ] && check_status_before_run cleanup_remove_sendmail
+    check_status_before_run cleanup_remove_mod_python
+    [ X"${KERNEL_NAME}" == X'LINUX' \
+        -o X"${KERNEL_NAME}" == X'OPENBSD' \
+        ] && check_status_before_run cleanup_replace_firewall_rules
+    [ X"${DISTRO}" == X"RHEL" ] && check_status_before_run cleanup_replace_mysql_config
+    check_status_before_run cleanup_backup_scripts
+    [ X"${BACKEND}" == X'PGSQL' ] && check_status_before_run cleanup_pgsql_force_password
+
     if [ X"${DISTRO}" == X'FREEBSD' -o X"${DISTRO}" == X'OPENBSD' ]; then
         check_status_before_run cleanup_update_compile_spamassassin_rules
     fi

iRedMail/pkgs/MD5.misc

 0c3406444444c15d1c76a38500693a1c  misc/iRedAdmin-0.3.tar.bz2
 59a49054039ceb852c2da377d8742360  misc/phpldapadmin-1.2.3.tgz
 a93d12d5e9de21053df3fef5e189bcf5  misc/phpMyAdmin-4.0.8-all-languages.tar.bz2
-5afe6d406009d4623983ffd81c5d6ec2  misc/iRedAPD-1.4.2.tar.bz2
+af334b09d503e0257080928eb8666837  misc/iRedAPD-1.4.2.tar.bz2
 ad8f05cef0c443d9ce2940bf36319c24  misc/phpPgAdmin-5.1.tar.bz2
 757f6ab3306d4abf8da6664ae65138d7  misc/roundcubemail-0.9.5.tar.gz

iRedMail/pkgs/MD5.openbsd

 0c3406444444c15d1c76a38500693a1c  misc/iRedAdmin-0.3.tar.bz2
-5afe6d406009d4623983ffd81c5d6ec2  misc/iRedAPD-1.4.2.tar.bz2
+af334b09d503e0257080928eb8666837  misc/iRedAPD-1.4.2.tar.bz2

iRedMail/pkgs/SHASUM.freebsd.misc

 76587b2c5059f0570b3e47921f17bcba04b6e571  misc/iRedAdmin-0.3.tar.bz2
-f2ef7af9bdb437e0ebe8b5840e0effeec8e4baf4  misc/iRedAPD-1.4.2.tar.bz2
+9f79f66656b51f786e6dfd696dec3191960ce024  misc/iRedAPD-1.4.2.tar.bz2