1. Zhang Huangbin
  2. iredmail

Commits

Zhang Huangbin  committed 61c7195

Code cleanup.

  • Participants
  • Parent commits 0df3a8d
  • Branches default

Comments (0)

Files changed (2)

File iRedMail/functions/cleanup.sh

View file
         chown ${SYS_ROOT_USER}:${SYS_ROOT_GROUP} ${BACKUP_SCRIPT_OPENLDAP}
         chmod 0700 ${BACKUP_SCRIPT_OPENLDAP}
 
-        perl -pi -e 's#^(BACKUP_ROOTDIR=).*#${1}"$ENV{BACKUP_DIR}"#' ${BACKUP_SCRIPT_OPENLDAP}
+        perl -pi -e 's#^(export BACKUP_ROOTDIR=).*#${1}"$ENV{BACKUP_DIR}"#' ${BACKUP_SCRIPT_OPENLDAP}
 
         # Add cron job
         cat >> ${CRON_SPOOL_DIR}/root <<EOF
         chmod 0700 ${BACKUP_SCRIPT_MYSQL}
 
         export MYSQL_ROOT_PASSWD MYSQL_BACKUP_DATABASES
-        perl -pi -e 's#^(BACKUP_ROOTDIR=).*#${1}"$ENV{BACKUP_DIR}"#' ${BACKUP_SCRIPT_MYSQL}
-        perl -pi -e 's#^(MYSQL_USER=).*#${1}"$ENV{MYSQL_ROOT_USER}"#' ${BACKUP_SCRIPT_MYSQL}
-        perl -pi -e 's#^(MYSQL_PASSWD=).*#${1}"$ENV{MYSQL_ROOT_PASSWD}"#' ${BACKUP_SCRIPT_MYSQL}
-        perl -pi -e 's#^(DATABASES=).*#${1}"$ENV{MYSQL_BACKUP_DATABASES}"#' ${BACKUP_SCRIPT_MYSQL}
+        perl -pi -e 's#^(export BACKUP_ROOTDIR=).*#${1}"$ENV{BACKUP_DIR}"#' ${BACKUP_SCRIPT_MYSQL}
+        perl -pi -e 's#^(export MYSQL_USER=).*#${1}"$ENV{MYSQL_ROOT_USER}"#' ${BACKUP_SCRIPT_MYSQL}
+        perl -pi -e 's#^(export MYSQL_PASSWD=).*#${1}"$ENV{MYSQL_ROOT_PASSWD}"#' ${BACKUP_SCRIPT_MYSQL}
+        perl -pi -e 's#^(export DATABASES=).*#${1}"$ENV{MYSQL_BACKUP_DATABASES}"#' ${BACKUP_SCRIPT_MYSQL}
 
         # Add cron job
         cat >> ${CRON_SPOOL_DIR}/root <<EOF

File iRedMail/tools/backup_openldap.sh

View file
 #########################################################
 
 # Where to store backup copies.
-BACKUP_ROOTDIR='/var/vmail/backup'
+export BACKUP_ROOTDIR='/var/vmail/backup'
 
 # Compress plain SQL file: YES, NO.
-COMPRESS="YES"
+export COMPRESS="YES"
 
 # Delete plain LDIF files after compressed. Compressed copy will be remained.
-DELETE_PLAIN_LDIF_FILE="YES"
+export DELETE_PLAIN_LDIF_FILE="YES"
 
 #########################################################
 # You do *NOT* need to modify below lines.
 export PATH="$PATH:/usr/sbin:/usr/local/sbin/"
 
 # Commands.
-CMD_DATE='/bin/date'
-CMD_DU='du -sh'
-CMD_COMPRESS='bzip2 -9'
+export CMD_DATE='/bin/date'
+export CMD_DU='du -sh'
+export CMD_COMPRESS='bzip2 -9'
 
 if [ -f /etc/ldap/slapd.conf ]; then
     export CMD_SLAPCAT='slapcat -f /etc/ldap/slapd.conf'