Commits

Zhang Huangbin  committed 2501a9b

Fixed: Enable Apache module config file with a2enconf for iRedAdmin.

  • Participants
  • Parent commits 25104d9

Comments (0)

Files changed (4)

File iRedMail/conf/iredadmin

 # MySQL database name, username and password.
 export IREDADMIN_DB_NAME="${IREDADMIN_USER_NAME}"
 export IREDADMIN_DB_USER="${IREDADMIN_USER_NAME}"
-export IREDADMIN_DB_PASSWD="$(${RANDOM_STRING})"
 
 export MYSQL_BACKUP_DATABASES="${MYSQL_BACKUP_DATABASES} ${IREDADMIN_DB_NAME}"
 export PGSQL_BACKUP_DATABASES="${PGSQL_BACKUP_DATABASES} ${IREDADMIN_DB_NAME}"

File iRedMail/conf/roundcube

 # Database setting.
 export RCM_DB="roundcubemail"
 export RCM_DB_USER="roundcube"
-export RCM_DB_PASSWD="$(${RANDOM_STRING})"
 export MYSQL_BACKUP_DATABASES="${MYSQL_BACKUP_DATABASES} ${RCM_DB}"
 export PGSQL_BACKUP_DATABASES="${PGSQL_BACKUP_DATABASES} ${RCM_DB}"
 

File iRedMail/dialog/optional_components.sh

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

File iRedMail/functions/iredadmin.sh

 EOF
     fi
 
+    # Enable Apache module config file on Ubuntu 13.10.
+    if [ X"${DISTRO}" == X'UBUNTU' -a X"${DISTRO_CODENAME}" == X'saucy' ]; then
+        a2enconf iredadmin &>/dev/null
+    fi
+
     ECHO_DEBUG "Import iredadmin database template."
     if [ X"${BACKEND}" == X'OPENLDAP' -o X"${BACKEND}" == X'MYSQL' ]; then
         # Required by MySQL-5.6: TEXT/BLOB column cannot have a default value.