Commits

Zhang Huangbin committed ce82833

It now works perfectly on Ubuntu 12.04 (precise). Tested on Ubuntu 12.04 alpha 2.

  • Participants
  • Parent commits 030d293

Comments (0)

Files changed (3)

iRedMail/functions/awstats.sh

     #fi
 
     # Assign Apache daemon user to group 'adm', so that Awstats cron job can read log files.
-    if [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then
-        usermod -g adm ${HTTPD_USER} >/dev/null
+    if [ X"${DISTRO}" == X"DEBIAN" \
+        -o X"${DISTRO}" == X"UBUNTU" \
+        ]; then
+        usermod -G adm ${HTTPD_USER} >/dev/null
     fi
 
     cat > ${AWSTATS_HTTPD_CONF} <<EOF

iRedMail/functions/cluebringer.sh

             # Append cluebringer default sql template.
             gunzip -c /usr/share/doc/postfix-cluebringer/database/policyd-db.mysql.gz >> ${tmp_sql}
 
+            if [ X"${DISTRO_CODENAME}" == X"oneiric" \
+                -o X"${DISTRO_CODENAME}" == X"precise" \
+                ]; then
+                # Convert 'TYPE=' to 'ENGINE='
+                perl -pi -e 's#TYPE=#ENGINE=#g' ${tmp_sql}
+            fi
+
         elif [ X"${BACKEND}" == X"PGSQL" ]; then
             cat > ${tmp_sql} <<EOF
 CREATE DATABASE ${CLUEBRINGER_DB_NAME} WITH TEMPLATE template0 ENCODING 'UTF8';

iRedMail/functions/iredadmin.sh

         if [ X"${DISTRO_VERSION}" != X"11.3" -a X"${DISTRO_VERSION}" != X"11.4" ]; then
             # Convert 'TYPE=' to 'ENGINE=' while creating tables.
             perl -pi -e 's#TYPE=#ENGINE=#g' ${IREDADMIN_HTTPD_ROOT}/docs/samples/iredadmin.sql
-
-            # Convert TIMESTAMP(14) to TIMESTAMP.
-            perl -pi -e 's#TIMESTAMP\(14\)#TIMESTAMP#g' ${IREDADMIN_HTTPD_ROOT}/docs/samples/iredadmin.sql
         fi
     fi
 
+    perl -pi -e 's#TIMESTAMP\(14\)#TIMESTAMP#g' ${IREDADMIN_HTTPD_ROOT}/docs/samples/iredadmin.sql
+
     # Copy sample configure file.
     cd ${IREDADMIN_HTTPD_ROOT}/