Zhang Huangbin avatar Zhang Huangbin committed 39f0125

Add one more index for amavisd database: msgs.content.
Package updates:
- Roundcube -> 0.6.0
- phpMyAdmin -> 3.3.6
Starting Ubuntu 11.10 support, not yet completed.

Comments (0)

Files changed (11)

iRedMail/ChangeLog

     * Add missing INDEXes for Amavisd database: msgs.mail_id, (msgs.content,
       msgs.time_num), quarantine.mail_id.
       Thanks rjnena <rjnena@gmail>, David <dcharbonnier@gmail>.
+    * Package update:
+        + Roundcube webmail -> 0.6.0
+        + phpMyAdmin -> 3.4.6
 
 iRedMail-0.7.3:
     * Add enabledService=lda for newly created LDAP mail user. Required by

iRedMail/conf/dovecot

     export DOVECOT_SHARE_FOLDER_CONF='/etc/dovecot/dovecot-share-folder.conf'
     export DOVECOT_DELIVER='/usr/lib/dovecot/deliver'
 elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
-    export DOVECOT_VERSION='1.1'
-
-    # Debian 5 (with backports), Ubuntu 10.04 uses dovecot-1.2.x.
-    [ X"${DISTRO}" == X"DEBIAN" ] && export DOVECOT_VERSION='1.2'
-
-    # Ubuntu 10.04+
-    if [ X"${DISTRO_CODENAME}" == X"lucid" -o X"${DISTRO_CODENAME}" == X"natty" ]; then
+    if [ X"${DISTRO}" == X"DEBIAN" ]; then
+        # Debian 5 (with backports), 6.
         export DOVECOT_VERSION='1.2'
+    elif [ X"${DISTRO}" == X"UBUNTU" ]; then
+        if [ X"${DISTRO_CODENAME}" == X"hardy" \
+            -o X"${DISTRO_CODENAME}" == X"intrepid" \
+            -o X"${DISTRO_CODENAME}" == X"jaunty" \
+            -o X"${DISTRO_CODENAME}" == X"karmic" \
+            ]; then
+            export DOVECOT_VERSION='1.1'
+        elif [ X"${DISTRO_CODENAME}" == X"lucid" \
+            -o X"${DISTRO_CODENAME}" == X"natty" \
+            ]; then
+            # Ubuntu 10.04, 10.10, 11.04
+            export DOVECOT_VERSION='1.2'
+        else:
+            # Ubuntu 11.10+
+            export DOVECOT_VERSION='2'
+        fi
     fi
 
     export DOVECOT_CONF='/etc/dovecot/dovecot.conf'

iRedMail/conf/global

         #   - 10.04: lucid
         #   - 10.10: maverick
         #   - 11.04: natty
+        #   - 11.10: oneiric
         export DISTRO_CODENAME="$( grep 'DISTRIB_CODENAME' /etc/lsb-release | awk -F'=' '{print $2}' )"
         # Mark 10.10 (maverick) as 10.04 (lucid).
         if [ X"${DISTRO_CODENAME}" == X"maverick" ]; then

iRedMail/conf/phpmyadmin

 # along with iRedMail.  If not, see <http://www.gnu.org/licenses/>.
 #---------------------------------------------------------------------
 
-export PHPMYADMIN_VERSION='3.4.3.2-all-languages'
+export PHPMYADMIN_VERSION='3.4.6-all-languages'
 export PHPMYADMIN_TARBALL="phpMyAdmin-${PHPMYADMIN_VERSION}.tar.bz2"
 
 # Install phpMyAdmin with source tarball.

iRedMail/conf/roundcube

 # ---------------------------------------
 # RoundcubeMail. http://roundcube.net
 # ---------------------------------------
-export RCM_VERSION='0.5.4'
+export RCM_VERSION='0.6'
 export RCM_TARBALL="roundcubemail-${RCM_VERSION}.tar.gz"
 
 # HTTPD related

iRedMail/dialog/virtual_domain_config.sh

 
 WARNING:
 
-    * It can't be same as server hostname: ${HOSTNAME}.
+    * It cannot be the same as server hostname: ${HOSTNAME}.
 " 20 76 2>/tmp/first_domain
 
     FIRST_DOMAIN="$(cat /tmp/first_domain)"

iRedMail/functions/packages.sh

         ENABLED_SERVICES="${ENABLED_SERVICES} apache2"
 
     elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
-        ALL_PKGS="${ALL_PKGS} apache2 apache2-mpm-prefork apache2.2-common libapache2-mod-php5 libapache2-mod-auth-mysql php5-cli php5-imap php5-gd php5-mcrypt php5-mysql php5-ldap php5-mhash"
+        ALL_PKGS="${ALL_PKGS} apache2 apache2-mpm-prefork apache2.2-common libapache2-mod-php5 libapache2-mod-auth-mysql php5-cli php5-imap php5-gd php5-mcrypt php5-mysql php5-ldap"
 
-        if [ X"${DISTRO_CODENAME}" == X"lucid" -o X"${DISTRO_CODENAME}" == X"natty" ]; then
+        if [ X"${DISTRO_CODENAME}" != X"oneiric" ]; then
+            ALL_PKGS="${ALL_PKGS} php5-mhash"
+        fi
+
+        if [ X"${DISTRO_CODENAME}" == X"lucid" \
+            -o X"${DISTRO_CODENAME}" == X"natty" \
+            -o X"${DISTRO_CODENAME}" == X"oneiric" \
+            ]; then
             if [ X"${BACKEND}" == X"OpenLDAP" ]; then
                 ALL_PKGS="${ALL_PKGS} php-net-ldap2"
             fi
         ALL_PKGS="${ALL_PKGS} policyd"
         ENABLED_SERVICES="${ENABLED_SERVICES} policyd"
     elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
-        ALL_PKGS="${ALL_PKGS} postfix-policyd"
-        ENABLED_SERVICES="${ENABLED_SERVICES} postfix-policyd"
+        if [ X"${DISTRO_CODENAME}" == X"oneiric" ]; then
+            # Policyd-2.x, code name "cluebringer".
+            ALL_PKGS="${ALL_PKGS} postfix-cluebringer"
+            ENABLED_SERVICES="${ENABLED_SERVICES} postfix-cluebringer"
+
+            if [ X"${BACKEND}" == X"OpenLDAP" -o X"${BACKEND}" == X"MySQL" ]; then
+                ALL_PKGS="${ALL_PKGS} postfix-cluebringer-mysql"
+            elif [ X"${BACKEND}" == X"PostgreSQL" ]; then
+                ALL_PKGS="${ALL_PKGS} postfix-cluebringer-pgsql"
+            fi
+        else
+            ALL_PKGS="${ALL_PKGS} postfix-policyd"
+            ENABLED_SERVICES="${ENABLED_SERVICES} postfix-policyd"
+        fi
+
 
         if [ X"${DISTRO_CODENAME}" == X"lucid" ]; then
             # Don't invoke dbconfig-common on Ubuntu.

iRedMail/pkgs/MD5.misc

 8d90e2cf15613ea6584aa8ff69b18205  misc/iRedAPD-1.3.6.tar.bz2
 ddd7ba4271056e9ce6b230420fd9b66b  misc/iRedAdmin-0.1.6.tar.bz2
-a4a401b87a89eabd5e113d9e2fe2ea84  misc/roundcubemail-0.5.4.tar.gz
+bdb9039d6fb95614a609aa1cb6476cf9  misc/roundcubemail-0.6.tar.gz
 9455d33186236059ea6c230841cb48b2  misc/phpldapadmin-1.2.1.1.tgz
-9905538aa08d6dc9029a3f8d9e7fe8ea  misc/phpMyAdmin-3.4.3.2-all-languages.tar.bz2
+c57c36d48128b5bc715d7477ebc21057  misc/phpMyAdmin-3.4.6-all-languages.tar.gz

iRedMail/pkgs/MD5.ubuntu.lucid

 8d90e2cf15613ea6584aa8ff69b18205  misc/iRedAPD-1.3.6.tar.bz2
 ddd7ba4271056e9ce6b230420fd9b66b  misc/iRedAdmin-0.1.6.tar.bz2
-a4a401b87a89eabd5e113d9e2fe2ea84  misc/roundcubemail-0.5.4.tar.gz
+bdb9039d6fb95614a609aa1cb6476cf9  misc/roundcubemail-0.6.tar.gz

iRedMail/pkgs/get_all.sh

 EOF
 
             # Force 'apt-get update' to enable backports repo.
+            ECHO_INFO "Execute 'apt-get update'..."
             ${APTGET} update
 
             ${APTGET} install -y debian-archive-keyring
         fi
 
         # Force update
+        ECHO_INFO "Execute 'apt-get update'..."
         ${APTGET} update
     fi
 }
         create_repo_debian
     else
         # Force update.
+        ECHO_INFO "Execute 'apt-get update'..."
         ${APTGET} update
     fi
 fi

iRedMail/samples/amavisd.mysql

 CREATE INDEX msgs_idx_time_num ON msgs (time_num);
 
 CREATE INDEX msgs_idx_mail_id   ON msgs (mail_id);
+CREATE INDEX msgs_idx_content   ON msgs (content);
 CREATE INDEX msgs_idx_content_time_num ON msgs (content, time_num);
 
 -- alternatively when purging based on time_iso (instead of msgs_idx_time_num):
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.