Commits

Zhang Huangbin committed e6444e8

Code cleanup.

  • Participants
  • Parent commits b310e06

Comments (0)

Files changed (3)

File iRedMail/conf/phpldapadmin

 export PHPLDAPADMIN_USE_SOURCE='YES'
 
 if [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
-    # Install phpLDAPadmin via apt repo. 
+    # Install phpLDAPadmin via apt repo
     export PHPLDAPADMIN_USE_SOURCE='NO'
 
     export PLA_HTTPD_ROOT="/usr/share/phpldapadmin"
     export PLA_CONF_DIR="${PLA_HTTPD_ROOT}/config"
 
 elif [ X"${DISTRO}" == X"FREEBSD" -o X"${DISTRO}" == X'OPENBSD' ]; then
-    # Install phpLDAPadmin via ports tree.
+    # Install phpLDAPadmin via ports tree
     export PHPLDAPADMIN_USE_SOURCE='NO'
 
     export PLA_HTTPD_ROOT="${HTTPD_SERVERROOT}/phpldapadmin/htdocs"

File iRedMail/conf/roundcube

 export RCM_VERSION='0.8.1'
 export RCM_TARBALL="roundcubemail-${RCM_VERSION}.tar.gz"
 
-# HTTPD related
+# Apache related settings
 if [ X"${DISTRO}" == X"FREEBSD" ]; then
+    # Install Roundcube via ports tree
+    export RCM_USE_SOURCE='NO'
+
     export RCM_HTTPD_ROOT="${HTTPD_SERVERROOT}/roundcube"
     export RCM_HTTPD_ROOT_SYMBOL_LINK="${RCM_HTTPD_ROOT}"
+
 elif [ X"${DISTRO}" == X'OPENBSD' ]; then
+    # Install Roundcube with binary package
+    export RCM_USE_SOURCE='NO'
+
     export RCM_HTTPD_ROOT="${HTTPD_SERVERROOT}/roundcubemail"
     export RCM_HTTPD_ROOT_SYMBOL_LINK="${RCM_HTTPD_ROOT}"
+
 else
     export RCM_HTTPD_ROOT="${HTTPD_SERVERROOT}/roundcubemail-${RCM_VERSION}"
     export RCM_HTTPD_ROOT_SYMBOL_LINK="${HTTPD_SERVERROOT}/roundcubemail"

File iRedMail/functions/roundcubemail.sh

     echo "export RCM_DB_USER='${RCM_DB_USER}'" >> ${CONFIG_FILE}
     echo "export RCM_DB_PASSWD='${RCM_DB_PASSWD}'" >> ${CONFIG_FILE}
 
-    # FreeBSD: install via ports tree.
-    if [ X"${DISTRO}" != X"FREEBSD" -a X"${DISTRO}" != X'OPENBSD' ]; then
+    if [ X"${RCM_USE_SOURCE}" != X'YES' ]; then
         cd ${MISC_DIR}
 
         # Extract source tarball.