Zhang Huangbin avatar Zhang Huangbin committed cb73abb

* Drop support for Ubuntu-11.10 (oneiric).
* New columns for MySQL/PGSQL backend in table vmail.mailbox:
isadmin, isglobaladmin, language.

Comments (0)

Files changed (10)

iRedMail/ChangeLog

 iRedMail-0.8.2:
+    * Drop support for Ubuntu-11.10 (oneiric).
+    * New columns for MySQL/PGSQL backend in table vmail.mailbox:
+      isadmin, isglobaladmin, language.
     * Allow to use LDAP attribute shadowAddress for mail list account.
       Thanks chrisjrob <cjr _at_ tridentgarages.co.uk> for the report.
     * Add checkpoint setting in OpenLDAP for data recovery, used to define

iRedMail/conf/amavisd

         fi
     elif [ X"${DISTRO}" == X'UBUNTU' ]; then
         if [ X"${DISTRO_CODENAME}" != X'lucid' \
-            -a X"${DISTRO_CODENAME}" != X'oneiric' \
             -a X"${DISTRO_CODENAME}" != X'precise' \
             ]; then
             export AMAVISD_VERSION='2.7'

iRedMail/conf/global

 
         # Ubuntu version number and code name:
         #   - 10.04: lucid (Long Term Support by Ubuntu)
-        #   - 11.10: oneiric
         #   - 12.04: precise (Long Term support by Ubuntu)
         export DISTRO_ID="$(grep 'DISTRIB_ID' /etc/lsb-release | awk -F'=' '{print $2}')"
         export DISTRO_VERSION="$(grep 'DISTRIB_RELEASE' /etc/lsb-release | awk -F'=' '{print $2}')"
         #   - 9.10: karmic
         #   - 10.10: maverick
         #   - 11.04: natty
+        #   - 11.10: oneiric
         if [ X"${DISTRO_CODENAME}" == X'hardy' \
             -o X"${DISTRO_CODENAME}" == X'intrepid' \
             -o X"${DISTRO_CODENAME}" == X'jaunty' \
             -o X"${DISTRO_CODENAME}" == X'karmic' \
             -o X"${DISTRO_CODENAME}" == X'maverick' \
             -o X"${DISTRO_CODENAME}" == X'natty' \
+            -o X"${DISTRO_CODENAME}" == X'oneiric' \
             ]; then
             export UNSUPPORTED_RELEASE='YES'
         fi

iRedMail/conf/policy_server

     fi
 
 elif [ X"${DISTRO}" == X'UBUNTU' ]; then
-    if [ X"${DISTRO_CODENAME}" == X"oneiric" \
-        -o X"${DISTRO_CODENAME}" == X"precise" \
-        ]; then
+    if [ X"${DISTRO_CODENAME}" != X'lucid' ]; then
         export USE_CLUEBRINGER='YES'
         export USE_POLICYD='NO'
     fi

iRedMail/functions/cluebringer.sh

 {
     ECHO_DEBUG "Add user and group for policyd: ${CLUEBRINGER_USER}:${CLUEBRINGER_GROUP}."
 
+    # User/group will be created during installing binary package on:
+    #   - Ubuntu
+    #   - openSUSE
+    #   - Gentoo
     if [ X"${DISTRO}" == X'RHEL' ]; then
         groupadd ${CLUEBRINGER_GROUP}
         useradd -m -d ${CLUEBRINGER_USER_HOME} -s ${SHELL_NOLOGIN} -g ${CLUEBRINGER_GROUP} ${CLUEBRINGER_USER}
-    elif [ X"${DISTRO}" == X"UBUNTU" ]; then
-        if [ X"${DISTRO_CODENAME}" == X"oneiric" \
-            -o X"${DISTRO_CODENAME}" == X"precise" \
-            ]; then
-            # User/group will be created during installing binary package.
-            :
-        fi
     elif [ X"${DISTRO}" == X'FREEBSD' ]; then
         pw useradd -n ${CLUEBRINGER_USER} -s ${SHELL_NOLOGIN} -d ${CLUEBRINGER_USER_HOME} -m
     fi
-    #elif [ X"${DISTRO}" == X"SUSE" ]; then
-    #    # Not need to add user/group.
-    #    :
-    #else
-    #    groupadd ${CLUEBRINGER_GROUP}
-    #    useradd -m -d ${CLUEBRINGER_USER_HOME} -s ${SHELL_NOLOGIN} -g ${CLUEBRINGER_GROUP} ${CLUEBRINGER_USER}
-    #fi
 
     echo 'export status_cluebringer_user="DONE"' >> ${STATUS_FILE}
 }

iRedMail/functions/postfix.sh

         echo 'sendmail_flags=NO' >> ${RC_CONF_LOCAL}
         /usr/local/sbin/postfix-enable &>/dev/null
         perl -pi -e 's/(.*sendmail -L sm-msp-queue.*)/#${1}/' ${CRON_SPOOL_DIR}/root 
-        perl -pi -e 's/^(inet_protocols.*)/#${1}/' ${POSTFIX_FILE_MAIN_CF}
     fi
 
     backup_file ${POSTFIX_FILE_MAIN_CF} ${POSTFIX_FILE_MASTER_CF}
         postconf -e mydomain="${HOSTNAME}"
     fi
 
-    postconf -e inet_protocols="ipv4"
     postconf -e mydestination="\$myhostname, localhost, localhost.localdomain, localhost.\$myhostname"
     postconf -e biff="no"   # Do not notify local user.
     postconf -e inet_interfaces="all"

iRedMail/samples/dovecot/dovecot2.conf

 # Listen addresses.
 #   - '*' means all available IPv4 addresses.
 #   - '[::]' means all available IPv6 addresses.
-# Use below setting to listen on all available addresses:
-#listen = *, [::]
-listen = *
+# Listen on all available addresses by default
+listen = *, [::]
 
 #base_dir = PH_BASE_DIR
 

iRedMail/samples/iredmail.mysql

     department VARCHAR(255) NOT NULL DEFAULT '',
     rank VARCHAR(255) NOT NULL DEFAULT 'normal',
     employeeid VARCHAR(255) DEFAULT '',
+    isadmin TINYINT(1) NOT NULL DEFAULT 0,
+    isglobaladmin TINYINT(1) NOT NULL DEFAULT 0,
+    language VARCHAR(5) NOT NULL DEFAULT 'en_US',
     enablesmtp TINYINT(1) NOT NULL DEFAULT 1,
     enablesmtpsecured TINYINT(1) NOT NULL DEFAULT 1,
     enablepop3 TINYINT(1) NOT NULL DEFAULT 1,
     INDEX (domain),
     INDEX (department),
     INDEX (employeeid),
+    INDEX (isadmin),
     INDEX (enablesmtp),
     INDEX (enablesmtpsecured),
     INDEX (enablepop3),

iRedMail/samples/iredmail.pgsql

     department VARCHAR(255) NOT NULL DEFAULT '',
     rank VARCHAR(255) NOT NULL DEFAULT 'normal',
     employeeid VARCHAR(255) DEFAULT '',
+    isadmin INT2 NOT NULL DEFAULT 0,
+    isglobaladmin INT2 NOT NULL DEFAULT 0,
+    language VARCHAR(5) NOT NULL DEFAULT 'en_US',
     enablesmtp INT2 NOT NULL DEFAULT 1,
     enablesmtpsecured INT2 NOT NULL DEFAULT 1,
     enablepop3 INT2 NOT NULL DEFAULT 1,
 CREATE INDEX idx_mailbox_domain ON mailbox (domain);
 CREATE INDEX idx_mailbox_department ON mailbox (department);
 CREATE INDEX idx_mailbox_employeeid ON mailbox (employeeid);
+CREATE INDEX idx_mailbox_isadmin ON mailbox (isadmin);
 CREATE INDEX idx_mailbox_enablesmtp ON mailbox (enablesmtp);
 CREATE INDEX idx_mailbox_enablesmtpsecured ON mailbox (enablesmtpsecured);
 CREATE INDEX idx_mailbox_enablepop3 ON mailbox (enablepop3);

iRedMail/tools/create_mail_user_OpenLDAP.py

     print '''
 CSV file format:
 
-    domain name, username, password, [common name], [quota], [groups]
+    domain name, username, password, [common name], [quota_in_bytes], [groups]
 
 Example #1:
-    iredmail.org, zhang, plain_password, Zhang Huangbin, 1024, group1:group2
+    iredmail.org, zhang, plain_password, Zhang Huangbin, 104857600, group1:group2
 Example #2:
     iredmail.org, zhang, plain_password, Zhang Huangbin, ,
 Example #3:
-    iredmail.org, zhang, plain_password, , 1024, group1:group2
+    iredmail.org, zhang, plain_password, , 104857600, group1:group2
      
 Note:
     - Domain name, username and password are REQUIRED, others are optional:
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.