Commits

Zhang Huangbin committed 25104d9

Append Roundcube/iRedAdmin database password in ./config file before #EOF.

Comments (0)

Files changed (4)

iRedMail/dialog/config_via_dialog.sh

 . ${CONF_DIR}/core
 . ${CONF_DIR}/openldap
 . ${CONF_DIR}/postfix
+. ${CONF_DIR}/roundcube
+. ${CONF_DIR}/iredadmin
 
 trap "exit 255" 2
 

iRedMail/dialog/optional_components.sh

     export USE_FAIL2BAN='YES'
     echo "export USE_FAIL2BAN='YES'" >>${IREDMAIL_CONFIG_FILE}
 fi
+
+echo "export IREDADMIN_DB_PASSWD='${IREDADMIN_DB_PASSWD}'" >> ${IREDMAIL_CONFIG_FILE}
+echo "export RCM_DB_PASSWD='${RCM_DB_PASSWD}'" >> ${IREDMAIL_CONFIG_FILE}

iRedMail/functions/iredadmin.sh

 {
     ECHO_INFO "Configure iRedAdmin (official web-based admin panel)."
 
-    echo "export IREDADMIN_DB_PASSWD='${IREDADMIN_DB_PASSWD}'" >> ${IREDMAIL_CONFIG_FILE}
-
     if [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
         ECHO_DEBUG "Enable apache module: wsgi."
         a2enmod wsgi >/dev/null 2>&1

iRedMail/functions/roundcubemail.sh

 {
     ECHO_INFO "Configure Roundcube webmail."
 
-    echo "export RCM_DB_USER='${RCM_DB_USER}'" >> ${IREDMAIL_CONFIG_FILE}
-    echo "export RCM_DB_PASSWD='${RCM_DB_PASSWD}'" >> ${IREDMAIL_CONFIG_FILE}
-
     if [ X"${RCM_USE_SOURCE}" == X'YES' ]; then
         cd ${MISC_DIR}