From 20aa6b4c032ba0e291865078b382a9c6dcaed783 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Sun, 21 Sep 2008 11:08:29 -0400 Subject: [PATCH] Fixed a few bugs in ubuntu 8.04 sasl setup. --- install/lib/installer_base.lib.php | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index a3eab1b..711c838 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -407,7 +407,10 @@ 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 @@ -415,6 +418,9 @@ $content = rf($configfile); $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 @@ 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); } -- Gitblit v1.9.1