Zhang Huangbin avatar Zhang Huangbin committed bec313b

Typo.

Comments (0)

Files changed (7)

iRedMail/conf/amavisd

 export AMAVISD_DB_USER='amavisd'
 export AMAVISD_DB_PASSWD="$(${RANDOM_STRING})"
 export MYSQL_BACKUP_DATABASES="${MYSQL_BACKUP_DATABASES} ${AMAVISD_DB_NAME}"
+export PGSQL_BACKUP_DATABASES="${PGSQL_BACKUP_DATABASES} ${AMAVISD_DB_NAME}"
 export AMAVISD_VERSION='2.6'
 
 # Altermime.

iRedMail/conf/cluebringer

 export CLUEBRINGER_RC_SCRIPT="${DIR_RC_SCRIPTS}/${CLUEBRINGER_RC_SCRIPT_NAME}"
 
 export MYSQL_BACKUP_DATABASES="${MYSQL_BACKUP_DATABASES} ${CLUEBRINGER_DB_NAME}"
+export PGSQL_BACKUP_DATABASES="${PGSQL_BACKUP_DATABASES} ${CLUEBRINGER_DB_NAME}"

iRedMail/conf/global

 
 # SQL databases which need to be backed up.
 export MYSQL_BACKUP_DATABASES=''
+export PGSQL_BACKUP_DATABASES=''
 
 # Command use to fetch source tarballs.
 if [ X"${DISTRO}" == X'FREEBSD' -o X"${DISTRO}" == X'OPENBSD' ]; then

iRedMail/conf/iredadmin

 export IREDADMIN_DB_NAME='iredadmin'
 export IREDADMIN_DB_USER='iredadmin'
 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}"

iRedMail/conf/roundcube

 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}"
 
 # this key is used to encrypt the users imap password which is stored
 # in the session record (and the client cookie if remember password is enabled).

iRedMail/functions/iredadmin.sh

 {
     ECHO_INFO "Configure iRedAdmin (official web-based admin panel)."
 
-    # Backup database.
-    export MYSQL_BACKUP_DATABASES="${MYSQL_BACKUP_DATABASES} ${IREDADMIN_DB_NAME}"
-    export PGSQL_BACKUP_DATABASES="${PGSQL_BACKUP_DATABASES} ${IREDADMIN_DB_NAME}"
-
     if [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" -o X"${DISTRO}" == X"SUSE" ]; then
         ECHO_DEBUG "Enable apache module: wsgi."
         a2enmod wsgi >/dev/null 2>&1
 
         # Section [ldap].
         ECHO_DEBUG "Configure OpenLDAP backend related settings."
-        perl -pi -e 's#^(uri.*=).*#${1} ldap://$ENV{LDAP_SERVER_HOST}:$ENV{LDAP_SERVER_PORT}#' settings.ini
-        perl -pi -e 's#^(basedn.*=).*#${1} ${LDAP_BASEDN}#' settings.ini
-        perl -pi -e 's#^(domainadmin_dn.*=).*#${1} ${LDAP_ADMIN_BASEDN}#' settings.ini
-        perl -pi -e 's#^(bind_dn.*=).*#${1} ${LDAP_ADMIN_DN}#' settings.ini
-        perl -pi -e 's#^(bind_pw.*=).*#${1} ${LDAP_ADMIN_PW}#' settings.ini
+        perl -pi -e 's#^(uri =).*#${1} ldap://$ENV{LDAP_SERVER_HOST}:$ENV{LDAP_SERVER_PORT}#' settings.ini
+        perl -pi -e 's#^(basedn =).*#${1} ${LDAP_BASEDN}#' settings.ini
+        perl -pi -e 's#^(domainadmin_dn =).*#${1} ${LDAP_ADMIN_BASEDN}#' settings.ini
+        perl -pi -e 's#^(bind_dn =).*#${1} ${LDAP_ADMIN_DN}#' settings.ini
+        perl -pi -e 's#^(bind_pw =).*#${1} ${LDAP_ADMIN_PW}#' settings.ini
 
     elif [ X"${BACKEND}" == X"MYSQL" -o X"${BACKEND}" == X'PGSQL' ]; then
         ECHO_DEBUG "Configure MySQL related settings."

iRedMail/samples/sa.local.cf

 bayes_auto_expire  1
 #
 # Store bayesian data in SQL database
-#bayes_store_module Mail::SpamAssassin::BayesStore::SQL
 # For MySQL
+#bayes_store_module Mail::SpamAssassin::BayesStore::MySQL
 #bayes_sql_dsn      DBI:mysql:database:sql_server:sql_port
 # For PostgreSQL
+#bayes_store_module Mail::SpamAssassin::BayesStore::PgSQL
 #bayes_sql_dsn      DBI:Pg:database:sql_server:sql_port
+#
 #bayes_sql_username db_username
 #bayes_sql_password db_password
 #
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.