Fixed a few bugs in ubuntu 8.04 sasl setup.

install/lib/installer_base.lib.php

@@ -407,7 +407,10 @@ class installer_base {
 		if(is_file($configfile.'~')) exec('chmod 400 '.$configfile.'~');
 		$content = rf($configfile);
 		$content = str_replace('START=no','START=yes',$content);
+		// Debian
 		$content = str_replace('OPTIONS="-c"','OPTIONS="-m /var/spool/postfix/var/run/saslauthd -r"',$content);
+		// Ubuntu
+		$content = str_replace('OPTIONS="-c -m /var/run/saslauthd"','OPTIONS="-c -m /var/spool/postfix/var/run/saslauthd -r"',$content);
 		wf($configfile,$content);
 		
 		// Edit the file /etc/init.d/saslauthd
@@ -416,6 +419,9 @@ class installer_base {
 		$content = str_replace('PIDFILE=$RUN_DIR/saslauthd.pid','PIDFILE="/var/spool/postfix/var/run/${NAME}/saslauthd.pid"',$content);
 		wf($configfile,$content);
 		
+		// add the postfix user to the sasl group (at least nescessary for ubuntu 8.04 and most likely debian lenny too.
+		exec('adduser postfix sasl');
+		
 		
 	}
 	
@@ -611,7 +617,7 @@ class installer_base {
 		exec('mkdir -p /var/log/ispconfig/httpd');
 		
 		if(is_file('/etc/suphp/suphp.conf')) {
-			replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin/php-cgi','x-httpd-suphp=php:/usr/bin/php-cgi',0);
+			replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin','x-httpd-suphp=php:/usr/bin/php-cgi',0);
 			replaceLine('/etc/suphp/suphp.conf','docroot=','docroot=/var/clients',0);
 		}
 		

install/tpl/amavisd_user_config.master

@@ -49,6 +49,13 @@ $final_spam_destiny = D_DISCARD;
 $final_banned_destiny = D_BOUNCE;
 $final_bad_header_destiny = D_DISCARD;
 
+# Default settings, we st this very high to not filter aut emails accidently
+$sa_spam_subject_tag = '***SPAM*** ';
+$sa_tag_level_deflt  = 20.0;  # add spam info headers if at, or above that level
+$sa_tag2_level_deflt = 60.0; # add 'spam detected' headers at that level
+$sa_kill_level_deflt = 60.0; # triggers spam evasive actions
+$sa_dsn_cutoff_level = 100;   # spam level beyond which a DSN is not sent
+
 #
 # Disable spam and virus notifications for the admin user.
 # Can be overridden by the policies in mysql
@@ -65,7 +72,8 @@ $spam_admin = undef;
 $DO_SYSLOG = 1;
 $LOGFILE = "/var/log/amavis.log";  # (defaults to empty, no log)
 
-$log_level = 5;                # (defaults to 0)
+# Set the log_level to 5 for debugging
+$log_level = 0;                # (defaults to 0)
 
 
 #------------ Do not modify anything below this line -------------