Fixed bugs in opensuse config and docs Fixed a bug that prevented the modif...

tbrehm

2009-03-10 ce6dcf483febeb655958e0afae0eb320bed05bea

 install/dist/lib/opensuse.lib.php

@@ -159,9 +159,15 @@
        }
      $configfile = $config_dir.'/master.cf';
      $content = rf($configfile);
		
      $content = str_replace('  flags=DRhu user=vmail argv=/usr/bin/maildrop -d ${recipient}', 
                   '  flags=R user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
                     $content);
		
      $content = str_replace('  flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}', 
                   '  flags=R user='.$cf['vmail_username'].' argv=/usr/bin/maildrop -d ${recipient} ${extension} ${recipient} ${user} ${nexthop} ${sender}',
                     $content);
		
      wf($configfile, $content);
      
      //* Writing the Maildrop mailfilter file
@@ -222,6 +228,9 @@
      $configfile = $conf["init_scripts"].'/'.$conf["saslauthd"]["init_script"];
      $content = rf($configfile);
      $content = str_replace('/sbin/startproc $AUTHD_BIN -a $SASLAUTHD_AUTHMECH -n $SASLAUTHD_THREADS > /dev/null 2>&1','/sbin/startproc $AUTHD_BIN -r -a $SASLAUTHD_AUTHMECH -n $SASLAUTHD_THREADS > /dev/null 2>&1',$content);
      $content = str_replace('/sbin/startproc $AUTHD_BIN $SASLAUTHD_PARAMS -a $SASLAUTHD_AUTHMECH -n $SASLAUTHD_THREADS > /dev/null 2>&1','/sbin/startproc $AUTHD_BIN $SASLAUTHD_PARAMS -r -a $SASLAUTHD_AUTHMECH -n $SASLAUTHD_THREADS > /dev/null 2>&1',$content);
		
		
      wf($configfile,$content);
      
      
@@ -420,13 +429,18 @@
      //* Create the logging directory for the vhost logfiles
      exec('mkdir -p /var/log/ispconfig/httpd');
      
      if(is_file('/etc/suphp/suphp.conf')) {
         replaceLine('/etc/suphp.conf','php=php:/srv/www/cgi-bin/php5','x-httpd-suphp=php:/srv/www/cgi-bin/php5',0);
         replaceLine('/etc/suphp.conf','docroot=','docroot=/var/clients',0);
      }
		
      // Sites enabled and avaulable dirs
      exec('mkdir -p '.$conf['apache']['vhost_conf_enabled_dir']);
      exec('mkdir -p '.$conf['apache']['vhost_conf_dir']);
      
      $content = rf('/etc/apache2/httpd.conf');
      if(!stristr($content,'Include /etc/apache2/sites-enabled/')) {
         af('/etc/apache2/httpd.conf',"\nInclude /etc/apache2/sites-enabled/\n\n");
         af('/etc/apache2/httpd.conf',"\n<Directory /srv/www>\n    Options FollowSymlinks\n</Directory>\n\nInclude /etc/apache2/sites-enabled/\n\n");
      }
      unset($content);