Fixed various opensuse related bugs.

tbrehm

2009-03-18 8e5788104c5ba1fbb18ca89b472e5c847b38c256

Fixed various opensuse related bugs.

 install/dist/lib/opensuse.lib.php

@@ -429,9 +429,9 @@
        //* Create the logging directory for the vhost logfiles
        exec('mkdir -p /var/log/ispconfig/httpd');
        
        if(is_file('/etc/suphp/suphp.conf')) {
        if(is_file('/etc/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);
            replaceLine('/etc/suphp.conf','docroot=','docroot=/srv/www',0);

        }
        
        // Sites enabled and avaulable dirs
@@ -749,6 +749,11 @@
            
        }
        
        // Fix a setting in vhost master file for suse

        replaceLine('/usr/local/ispconfig/server/conf/vhost.conf.master',"suPHP_UserGroup","        suPHP_UserGroup <tmpl_var name='system_user'> <tmpl_var name='system_group'>",0);

		
		
		
        // Make the Clamav log files readable by ISPConfig
        //exec('chmod +r /var/log/clamav/clamav.log');
        //exec('chmod +r /var/log/clamav/freshclam.log');
@@ -782,9 +787,8 @@
        if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
        if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log');
        
        exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
        exec('chown getmail /usr/local/bin/run-getmail.sh');
        exec('chmod 744 /usr/local/bin/run-getmail.sh');
        exec('chown getmail /usr/local/ispconfig/server/scripts/run-getmail.sh');

        exec('chmod 744 /usr/local/ispconfig/server/scripts/run-getmail.sh');

        
        
    }
@@ -846,7 +850,7 @@
            $existing_cron_jobs = file('crontab.txt');
        
            $cron_jobs = array(
                '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
                '*/5 * * * * /usr/local/ispconfig/server/scripts/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'

            );
        
            // remove existing ispconfig cronjobs, in case the syntax has changed

 install/lib/installer_base.lib.php

@@ -204,6 +204,7 @@
        $tpl_ini_array['web']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_enabled_dir'];
        $tpl_ini_array['jailkit']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs'];
        $tpl_ini_array['fastcgi']['fastcgi_phpini_path'] = $conf['fastcgi']['fastcgi_phpini_path'];
        $tpl_ini_array['fastcgi']['fastcgi_starter_path'] = $conf['fastcgi']['fastcgi_starter_path'];

        $tpl_ini_array['server']['hostname'] = $conf['hostname'];
        $tpl_ini_array['server']['ip_address'] = @gethostbyname($conf['hostname']);
        $tpl_ini_array['web']['website_basedir'] = $conf['web']['website_basedir'];
@@ -1052,9 +1053,8 @@
        if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
        if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log');
        
        exec('mv /usr/local/ispconfig/server/scripts/run-getmail.sh /usr/local/bin/run-getmail.sh');
        exec('chown getmail /usr/local/bin/run-getmail.sh');
        exec('chmod 744 /usr/local/bin/run-getmail.sh');
        exec('chown getmail /usr/local/ispconfig/server/scripts/run-getmail.sh');

        exec('chmod 744 /usr/local/ispconfig/server/scripts/run-getmail.sh');

        
        
    }
@@ -1116,7 +1116,7 @@
            $existing_cron_jobs = file('crontab.txt');
        
            $cron_jobs = array(
                '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
                '*/5 * * * * /usr/local/ispconfig/server/scripts/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'

            );
        
            // remove existing ispconfig cronjobs, in case the syntax has changed