Commits

Zhang Huangbin  committed f246389

Add missing package 'python-distribute' on openSUSE-12.1.

  • Participants
  • Parent commits 2880e11

Comments (0)

Files changed (3)

File iRedMail/functions/amavisd.sh

   virus_admin_maps => ["root\@\$mydomain"],
   spam_admin_maps  => ["root\@$mydomain"],
   warnbadhsender   => 0,
-  warnvirussender  => 1,
-  warnspamsender   => 1,
+  #warnvirussender  => 1,
+  #warnspamsender   => 1,
   # forward to a smtpd service providing DKIM signing service
   #forward_method => 'smtp:[127.0.0.1]:10027',
   # force MTA conversion to 7-bit (e.g. before DKIM signing)
     virus_admin_maps => ["root\@\$mydomain"],
     spam_admin_maps  => ["root\@\$mydomain"],
     warnbadhsender   => 0,
-    warnvirussender  => 1,
-    warnspamsender   => 1,
 
     # forward to a smtpd service providing DKIM signing service
     #forward_method => 'smtp:[127.0.0.1]:10027',
 #\$X_HEADER_LINE = "by amavisd at \$myhostname";
 
 # Notify virus sender?
-\$warnvirussender = 0;
+#\$warnvirussender = 0;
 
 # Notify spam sender?
-\$warnspamsender = 0;
+#\$warnspamsender = 0;
 
 # Notify sender of banned files?
 \$warnbannedsender = 0;

File iRedMail/functions/packages.sh

         [ X"${USE_IREDAPD}" != "YES" ] && ALL_PKGS="${ALL_PKGS} python-ldap${PKG_ARCH}"
 
     elif [ X"${DISTRO}" == X"SUSE" ]; then
-        # Note: Web.py will be installed locally via 'easy_install'.
         ALL_PKGS="${ALL_PKGS} apache2-mod_wsgi python-jinja2 python-mysql python-xml"
+
+        # Note: Web.py will be installed locally with command 'easy_install'.
         if [ X"${DISTRO_VERSION}" == X"11.3" -o X"${DISTRO_VERSION}" == X"11.4" ]; then
             ALL_PKGS="${ALL_PKGS} python-setuptools"
+        else
+            ALL_PKGS="${ALL_PKGS} python-distribute"
         fi
         [ X"${USE_IREDAPD}" != "YES" ] && ALL_PKGS="${ALL_PKGS} python-ldap"
 

File iRedMail/functions/roundcubemail.sh

         perl -pi -e 's#(.*password_ldap_userDN_mask...=).*#${1} "$ENV{LDAP_ATTR_USER_RDN}=%login,$ENV{LDAP_ATTR_GROUP_RDN}=$ENV{LDAP_ATTR_GROUP_USERS},$ENV{LDAP_ATTR_DOMAIN_RDN}=%domain,$ENV{LDAP_BASEDN}";#' config.inc.php
 
         # Use 'md5crypt' instead of 'ssha', because SSHA requires PHP module
-        # 'mhash' which may be unavailable on all supported distros.
+        # 'mhash' which may be unavailable on some supported distros.
         perl -pi -e 's#(.*password_ldap_encodage.*=).*#${1} "md5crypt";#' config.inc.php
 
         perl -pi -e 's#(.*password_ldap_pwattr.*=).*#${1} "userPassword";#' config.inc.php