Commits

Zhang Huangbin committed cd75394

* Decrease Cluebringer log level.
* Add missing packages for Cluebringer on RHEL/CentOS while installing with remote MySQL server.
* Cleanup iRedMail.tips.

Comments (0)

Files changed (4)

iRedMail/dialog/virtual_domain_config.sh

     * Account: ${DOMAIN_ADMIN_NAME}@${FIRST_DOMAIN}
     * Password: ${DOMAIN_ADMIN_PASSWD_PLAIN}
 
-    Note:
-        - This account is used for system administrations, not a mail user.
-        - You can login iRedAdmin with this account, login name
-          is full email address.
+    You can login iRedAdmin with this account, login name is full email address.
 
 First mail user:
     * Username: ${FIRST_USER}@${FIRST_DOMAIN}
     * SMTP/IMAP auth type: login
     * Connection security: STARTTLS or SSL/TLS
 
-    Note:
-        - This account is a normal mail user.
-        - You can login webmail with this account, login name is full email address.
+    You can login webmail with this account, login name is full email address.
 
 EOF

iRedMail/functions/cluebringer.sh

     # 2 - Notices, warnings, errors
     # 3 - Info, notices, warnings, errors
     # 4 - Debugging 
-    perl -pi -e 's/^#(log_level=).*/${1}2/' ${CLUEBRINGER_CONF}
+    perl -pi -e 's/^#(log_level=).*/${1}0/' ${CLUEBRINGER_CONF}
     perl -pi -e 's/^(log_mail=).*/${1}mail\@syslog:native/' ${CLUEBRINGER_CONF}
 
     # File to log to instead of stdout

iRedMail/functions/iredapd.sh

         - ${IREDAPD_ROOT_DIR}/iRedAPD-${IREDAPD_VERSION}/
         - ${IREDAPD_ROOT_DIR}/iredapd/
         - ${IREDAPD_ROOT_DIR}/iredapd/etc/settings.py
+
 EOF
 
     echo 'export status_iredapd_config="DONE"' >> ${STATUS_FILE}

iRedMail/functions/packages.sh

 
     # Policyd.
     if [ X"${DISTRO}" == X"RHEL" ]; then
-        ALL_PKGS="${ALL_PKGS} cluebringer"
+        ALL_PKGS="${ALL_PKGS} cluebringer perl-DBD-MySQL.${PKG_ARCH} perl-DBD-Pg.${PKG_ARCH}"
         ENABLED_SERVICES="${ENABLED_SERVICES} ${CLUEBRINGER_RC_SCRIPT_NAME}"
+
     elif [ X"${DISTRO}" == X"SUSE" ]; then
         ALL_PKGS="${ALL_PKGS} cluebringer"
         ENABLED_SERVICES="${ENABLED_SERVICES} ${CLUEBRINGER_RC_SCRIPT_NAME}"