Commits

Zhang Huangbin committed c1b17b3

* Install PHP APC by default. Fixes issue #23
* Fix incorrect documentroot of Cluebringer webui on FreeBSD.
* Bump version number: 0.8.7.

  • Participants
  • Parent commits b86ee6a

Comments (0)

Files changed (5)

File iRedMail/ChangeLog

-iRedMail-0.9.0:
+iRedMail-0.8.7:
     * Works on new Linux/BSD distribution releases:
         - Ubuntu 14.04 LTS. With MariaDB support.
 

File iRedMail/conf/cluebringer

     export CLUEBRINGER_CONF='/usr/local/etc/cluebringer.conf'
     export CLUEBRINGER_WEBUI_CONF="${HTTPD_CONF_DIR}/cluebringer.conf"
     export CLUEBRINGER_PID_FILE='/var/run/cbpolicyd.pid'
-    export CLUEBRINGER_HTTPD_ROOT='/usr/share/cluebringer/webui'
+    export CLUEBRINGER_HTTPD_ROOT="${HTTPD_SERVERROOT}/policyd"
 
 fi
 

File iRedMail/conf/global

 
 export PROG_NAME='iRedMail'
 export PROG_NAME_LOWERCASE='iredmail'
-export PROG_VERSION='0.8.6'
+export PROG_VERSION='0.8.7'
 
 export DATE="$(/bin/date +%Y.%m.%d.%H.%M.%S)"
 

File iRedMail/functions/packages.sh

     #
     ENABLED_SERVICES="${ENABLED_SERVICES} ${HTTPD_RC_SCRIPT_NAME}"
     if [ X"${DISTRO}" == X"RHEL" ]; then
-        ALL_PKGS="${ALL_PKGS} httpd${PKG_ARCH} mod_ssl${PKG_ARCH} php${PKG_ARCH} php-common${PKG_ARCH} php-gd${PKG_ARCH} php-xml${PKG_ARCH} php-mysql${PKG_ARCH} php-ldap${PKG_ARCH} php-pgsql${PKG_ARCH} php-imap${PKG_ARCH} php-mbstring${PKG_ARCH}"
+        ALL_PKGS="${ALL_PKGS} httpd${PKG_ARCH} mod_ssl${PKG_ARCH} php${PKG_ARCH} php-common${PKG_ARCH} php-gd${PKG_ARCH} php-xml${PKG_ARCH} php-mysql${PKG_ARCH} php-ldap${PKG_ARCH} php-pgsql${PKG_ARCH} php-imap${PKG_ARCH} php-mbstring${PKG_ARCH} php-pecl-apc${PKG_ARCH}"
 
     elif [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
-        ALL_PKGS="${ALL_PKGS} libapache2-mod-php5 php5-imap php5-json php5-gd php5-mcrypt php5-curl mcrypt"
+        ALL_PKGS="${ALL_PKGS} libapache2-mod-php5 php5-imap php5-json php5-gd php5-mcrypt php5-curl mcrypt php-apc"
         [ X"${BACKEND}" == X'OPENLDAP' ] && ALL_PKGS="${ALL_PKGS} php5-ldap php5-mysql"
         [ X"${BACKEND}" == X'MYSQL' ] && ALL_PKGS="${ALL_PKGS} php5-mysql"
         [ X"${BACKEND}" == X'PGSQL' ] && ALL_PKGS="${ALL_PKGS} php5-pgsql"
     elif [ X"${DISTRO}" == X'OPENBSD' ]; then
-        ALL_PKGS="${ALL_PKGS} php php-bz2 php-imap php-mcrypt php-gd"
+        ALL_PKGS="${ALL_PKGS} php php-bz2 php-imap php-mcrypt php-gd pecl-APC"
 
         [ X"${BACKEND}" == X'OPENLDAP' ] && ALL_PKGS="${ALL_PKGS} php-ldap php-mysql php-mysqli"
         [ X"${BACKEND}" == X'MYSQL' ] && ALL_PKGS="${ALL_PKGS} php-mysql php-mysqli"
     fi
 
     # phpLDAPadmin
-    if [ X"${USE_PHPLDAPADMIN}" == X"YES" ]; then
+    if [ X"${USE_PHPLDAPADMIN}" == X'YES' ]; then
         if [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
-            if [ X"${DISTRO_CODENAME}" == X'wheezy'
+            if [ X"${DISTRO_CODENAME}" == X'wheezy' \
                 -o X"${DISTRO_CODENAME}" == X'precise' ]; then
                 ALL_PKGS="${ALL_PKGS} phpldapadmin"
             fi

File iRedMail/functions/packages_freebsd.sh

         lang_php5-extensions \
         lang_php5 \
         www_mod_php5 \
+        www_pecl-APC \
         lang_python27 \
         mail_dovecot2 \
         mail_policyd2 \
 OPTIONS_FILE_UNSET+=ZTS
 EOF
 
-    ALL_PORTS="${ALL_PORTS} lang/php5 www/mod_php5"
+    ALL_PORTS="${ALL_PORTS} lang/php5 www/mod_php5 www/pecl-APC"
 
     cat > /var/db/ports/lang_php5-extensions/options <<EOF
 OPTIONS_FILE_SET+=BCMATH
 OPTIONS_FILE_UNSET+=ZTS
 EOF
 
+    cat > /var/db/ports/www_pecl-APC/options <<EOF
+OPTIONS_FILE_SET+=DOCS
+OPTIONS_FILE_UNSET+=FILEHITS
+OPTIONS_FILE_UNSET+=IPC
+OPTIONS_FILE_UNSET+=SEMAPHORES
+OPTIONS_FILE_UNSET+=SPINLOCKS
+EOF
+
     # Policyd v2.x
     cat > /var/db/ports/mail_policyd2/options <<EOF
 OPTIONS_FILE_UNSET+=MYSQL