diff -cr iRedMail-0.8.0/conf/dovecot iRedMail-0.8.0.my/conf/dovecot *** iRedMail-0.8.0/conf/dovecot 2012-05-10 07:41:10.000000000 +0400 --- iRedMail-0.8.0.my/conf/dovecot 2012-06-06 17:13:56.185857343 +0400 *************** *** 80,86 **** elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then if [ X"${DISTRO}" == X"DEBIAN" ]; then ! export DOVECOT_VERSION='1.2' elif [ X"${DISTRO}" == X"UBUNTU" ]; then if [ X"${DISTRO_CODENAME}" == X"lucid" ]; then # Ubuntu 10.04 --- 80,86 ---- elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then if [ X"${DISTRO}" == X"DEBIAN" ]; then ! export DOVECOT_VERSION='2' elif [ X"${DISTRO}" == X"UBUNTU" ]; then if [ X"${DISTRO_CODENAME}" == X"lucid" ]; then # Ubuntu 10.04 diff -cr iRedMail-0.8.0/conf/global iRedMail-0.8.0.my/conf/global *** iRedMail-0.8.0/conf/global 2012-05-10 07:41:19.000000000 +0400 --- iRedMail-0.8.0.my/conf/global 2012-06-06 17:15:57.741853259 +0400 *************** *** 273,279 **** export DISTRO='DEBIAN' # Get major release version number ! export DISTRO_VERSION="$(cat /etc/debian_version | cut -b 1)" # Set distro code name and unsupported releases: # - 4: Etch --- 273,280 ---- export DISTRO='DEBIAN' # Get major release version number ! #export DISTRO_VERSION="$(cat /etc/debian_version | cut -b 1)" ! export DISTRO_VERSION=6 # Set distro code name and unsupported releases: # - 4: Etch diff -cr iRedMail-0.8.0/conf/policy_server iRedMail-0.8.0.my/conf/policy_server *** iRedMail-0.8.0/conf/policy_server 2012-05-10 07:41:10.000000000 +0400 --- iRedMail-0.8.0.my/conf/policy_server 2012-06-06 17:16:19.081852846 +0400 *************** *** 21,28 **** #--------------------------------------------------------------------- # Use policyd-1.8 by default ! export USE_CLUEBRINGER='NO' ! export USE_POLICYD='YES' # Use Policyd-2.x (cluebringer). if [ X"${DISTRO}" == X'RHEL' -o X"${DISTRO}" == X'SUSE' ]; then --- 21,29 ---- #--------------------------------------------------------------------- # Use policyd-1.8 by default ! #export USE_CLUEBRINGER='NO' ! #export USE_POLICYD='YES' ! export USE_CLUEBRINGER='YES'; export USE_POLICYD='NO' # Use Policyd-2.x (cluebringer). if [ X"${DISTRO}" == X'RHEL' -o X"${DISTRO}" == X'SUSE' ]; then diff -cr iRedMail-0.8.0/functions/packages.sh iRedMail-0.8.0.my/functions/packages.sh *** iRedMail-0.8.0/functions/packages.sh 2012-05-10 07:41:10.000000000 +0400 --- iRedMail-0.8.0.my/functions/packages.sh 2012-06-06 17:16:51.825851518 +0400 *************** *** 230,238 **** ENABLED_SERVICES="${ENABLED_SERVICES} ${CLUEBRINGER_RC_SCRIPT_NAME}" fi elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then ! if [ X"${DISTRO_CODENAME}" == X"oneiric" \ ! -o X"${DISTRO_CODENAME}" == X"precise" \ ! ]; then # Policyd-2.x, code name "cluebringer". ALL_PKGS="${ALL_PKGS} postfix-cluebringer postfix-cluebringer-webui" ENABLED_SERVICES="${ENABLED_SERVICES} ${CLUEBRINGER_RC_SCRIPT_NAME}" --- 230,238 ---- ENABLED_SERVICES="${ENABLED_SERVICES} ${CLUEBRINGER_RC_SCRIPT_NAME}" fi elif [ X"${DISTRO}" == X"DEBIAN" -o X"${DISTRO}" == X"UBUNTU" ]; then ! # if [ X"${DISTRO_CODENAME}" == X"oneiric" \ ! # -o X"${DISTRO_CODENAME}" == X"precise" \ ! # ]; then # Policyd-2.x, code name "cluebringer". ALL_PKGS="${ALL_PKGS} postfix-cluebringer postfix-cluebringer-webui" ENABLED_SERVICES="${ENABLED_SERVICES} ${CLUEBRINGER_RC_SCRIPT_NAME}" *************** *** 242,251 **** elif [ X"${BACKEND}" == X"PGSQL" ]; then ALL_PKGS="${ALL_PKGS} postfix-cluebringer-pgsql" fi ! else ! ALL_PKGS="${ALL_PKGS} postfix-policyd" ! ENABLED_SERVICES="${ENABLED_SERVICES} ${POLICYD_RC_SCRIPT_NAME}" ! fi if [ X"${DISTRO_CODENAME}" == X"lucid" ]; then --- 242,251 ---- elif [ X"${BACKEND}" == X"PGSQL" ]; then ALL_PKGS="${ALL_PKGS} postfix-cluebringer-pgsql" fi ! # else ! # ALL_PKGS="${ALL_PKGS} postfix-policyd" ! # ENABLED_SERVICES="${ENABLED_SERVICES} ${POLICYD_RC_SCRIPT_NAME}" ! # fi if [ X"${DISTRO_CODENAME}" == X"lucid" ]; then