Commits

Zhang Huangbin committed f7e434b

Code cleanup.

Comments (0)

Files changed (2)

iRedMail/conf/amavisd

 export PGSQL_BACKUP_DATABASES="${PGSQL_BACKUP_DATABASES} ${AMAVISD_DB_NAME}"
 
 # Amavisd-new-2.7 and 2.8.0 use the same SQL structure, but different from 2.6.
-export AMAVISD_VERSION='2.6'
+export AMAVISD_VERSION='2.7'
 
 # Altermime.
 export ALTERMIME_BIN='/usr/bin/altermime'
     export AMAVISD_DKIM_CONF="${AMAVISD_CONF}"
 
 elif [ X"${DISTRO}" == X"SUSE" ]; then
-    # openSUSE-12.1/12.2 ships Amavisd-new-2.7.0
-    export AMAVISD_VERSION='2.7'
-
     # Override global setting: user/group.
     export AMAVISD_SYS_USER='vscan'
     export AMAVISD_SYS_GROUP='vscan'
 
 elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
     # Debian 7 (wheezy) and Ubuntu 13.04 (raring) ships Amavisd-new-2.7
-    if [ X"${DISTRO}" == X'DEBIAN' ]; then
-        export AMAVISD_VERSION='2.7'
-    elif [ X"${DISTRO}" == X'UBUNTU' ]; then
-        if [ X"${DISTRO_CODENAME}" != X'precise' ]; then
-            export AMAVISD_VERSION='2.7'
-        fi
+    if [ X"${DISTRO_CODENAME}" == X'precise' ]; then
+        export AMAVISD_VERSION='2.6'
     fi
     export AMAVISD_BIN='/usr/sbin/amavisd-new'
     export AMAVISD_CONF_DIR='/etc/amavis/conf.d'
     export AMAVISD_VIRUSMAILS_DIR='/var/lib/amavis/virusmails'
 
 elif [ X"${DISTRO}" == X"FREEBSD" ]; then
-    export AMAVISD_VERSION='2.7'
-
     # Override global setting: user/group.
     export AMAVISD_SYS_USER='vscan'
     export AMAVISD_SYS_GROUP='vscan'
     export ALTERMIME_BIN='/usr/local/bin/altermime'
 
 elif [ X"${DISTRO}" == X'OPENBSD' ]; then
-    export AMAVISD_VERSION='2.7'
     export AMAVISD_SYS_USER='_vscan'
     export AMAVISD_SYS_GROUP='_vscan'
 

iRedMail/functions/iredadmin.sh

     # Modify iRedAdmin settings.
     # [general] section.
     ECHO_DEBUG "Configure general settings."
+    perl -pi -e 's#^(webmaster =).*#${1} $ENV{FIRST_USER}@$ENV{FIRST_DOMAIN}#' settings.ini
     perl -pi -e 's#^(storage_base_directory =).*#${1} $ENV{STORAGE_MAILBOX_DIR}#' settings.ini
 
     # [iredadmin] section.
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.