- Fixed FS#2631 - OpenSuSE: Check path to ispconfig fcgi starter script.

ftimme

2013-02-20 11ba593d5b2d29846e931449a5cb8a683e5f1334

- Fixed FS#2631 - OpenSuSE: Check path to ispconfig fcgi starter script.

 install/dist/conf/centos52.conf.php

@@ -99,6 +99,7 @@
//* Fastcgi
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/';
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';

//* Postfix
$conf['postfix']['installed'] = false; // will be detected automatically during installation

 install/dist/conf/centos53.conf.php

@@ -99,6 +99,7 @@
//* Fastcgi
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/';
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';

//* Postfix
$conf['postfix']['installed'] = false; // will be detected automatically during installation

 install/dist/conf/debian40.conf.php

@@ -101,6 +101,7 @@
//* Fastcgi
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/';
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';

//* Postfix
$conf['postfix']['installed'] = false; // will be detected automatically during installation

 install/dist/conf/debian60.conf.php

@@ -101,6 +101,7 @@
//* Fastcgi
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/';
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';

//* Postfix
$conf['postfix']['installed'] = false; // will be detected automatically during installation

 install/dist/conf/fedora9.conf.php

@@ -99,6 +99,7 @@
//* Fastcgi
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/';
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';

//* Postfix
$conf['postfix']['installed'] = false; // will be detected automatically during installation

 install/dist/conf/gentoo.conf.php

@@ -112,6 +112,7 @@
//* Fastcgi
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php/cgi-php5';
$conf['fastcgi']['fastcgi_starter_path'] = '/var/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';

//* Postfix
$conf['postfix']['installed'] = false; // will be detected automatically during installation

 install/dist/conf/opensuse110.conf.php

@@ -99,6 +99,7 @@
//* Fastcgi
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/fastcgi/';
$conf['fastcgi']['fastcgi_starter_path'] = '/srv/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';

//* Postfix
$conf['postfix']['installed'] = false; // will be detected automatically during installation

 install/dist/conf/opensuse112.conf.php

@@ -99,6 +99,7 @@
//* Fastcgi
$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/fastcgi/';
$conf['fastcgi']['fastcgi_starter_path'] = '/srv/www/php-fcgi-scripts/[system_user]/';
$conf['fastcgi']['fastcgi_bin'] = '/usr/bin/php-cgi';

//* Postfix
$conf['postfix']['installed'] = false; // will be detected automatically during installation

 install/dist/lib/fedora.lib.php

@@ -957,6 +957,7 @@
                    exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
                }
            
                /*
                exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
                exec('cp tpl/apache_ispconfig_fcgi_starter.master /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
@@ -964,6 +965,17 @@
                exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
            
                replaceLine('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter','PHPRC=','PHPRC=/etc/',0,0);
                */
                if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
                    $content = rf('tpl/apache_ispconfig_fcgi_starter.master');
                    $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
                    $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
                    exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
                    wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
                    exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                    exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
                    exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
                }
            }
        }
        

 install/dist/lib/gentoo.lib.php

@@ -938,13 +938,15 @@
            $vhost_path = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
            $this->write_config_file($vhost_path, $content);
        
            if (!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) 
            {
            if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
                $content = rf('tpl/apache_ispconfig_fcgi_starter.master');
                $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
                $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
                mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
                copy('tpl/apache_ispconfig_fcgi_starter.master', '/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
                exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                chmod('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', 0755);
                symlink($install_dir.'/interface/web', '/var/www/ispconfig');
                symlink($install_dir.'/interface/web','/var/www/ispconfig');
                exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
            }
        }

 install/dist/lib/opensuse.lib.php

@@ -988,8 +988,11 @@
            wf("$vhost_conf_dir/ispconfig.vhost", $content);
        
            if(!is_file('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
                $content = rf('tpl/apache_ispconfig_fcgi_starter.master');
                $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
                $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
                exec('mkdir -p /srv/www/php-fcgi-scripts/ispconfig');
                exec('cp tpl/apache_ispconfig_fcgi_starter.master /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                wf('/srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
                exec('chmod +x /srv/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                exec('ln -s /usr/local/ispconfig/interface/web /srv/www/ispconfig');
                exec('chown -R ispconfig:ispconfig /srv/www/php-fcgi-scripts/ispconfig');

 install/lib/installer_base.lib.php

@@ -215,6 +215,7 @@
        $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['fastcgi']['fastcgi_bin'] = $conf['fastcgi']['fastcgi_bin'];
        $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'];
@@ -1919,12 +1920,14 @@
                }
            }
            if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
                $content = rf('tpl/apache_ispconfig_fcgi_starter.master');
                $content = str_replace('{fastcgi_bin}', $conf['fastcgi']['fastcgi_bin'], $content);
                $content = str_replace('{fastcgi_phpini_path}', $conf['fastcgi']['fastcgi_phpini_path'], $content);
                mkdir('/var/www/php-fcgi-scripts/ispconfig', 0755, true);
                copy('tpl/apache_ispconfig_fcgi_starter.master','/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                wf('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter', $content);
                exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
                symlink($install_dir.'/interface/web','/var/www/ispconfig');
                exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');

            }
        }


 install/lib/update.lib.php

@@ -247,6 +247,7 @@
    $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['fastcgi']['fastcgi_bin'] = $conf['fastcgi']['fastcgi_bin'];
    $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'];

 install/tpl/apache_ispconfig_fcgi_starter.master

@@ -1,6 +1,6 @@
#!/bin/sh
PHPRC=/etc/php5/cgi/
PHPRC={fastcgi_phpini_path}
export PHPRC
export PHP_FCGI_MAX_REQUESTS=5000
export PHP_FCGI_CHILDREN=1
exec /usr/bin/php-cgi -d magic_quotes_gpc=off -d session.save_path=/usr/local/ispconfig/server/temp
exec {fastcgi_bin} -d magic_quotes_gpc=off -d session.save_path=/usr/local/ispconfig/server/temp