From 0f76ebb7208bd65a93c31c530a36c5a96c372cc8 Mon Sep 17 00:00:00 2001 From: tbrehm Date: Thu, 5 Mar 2009 15:35:27 +0000 Subject: [PATCH] made fastcgi php.ini path configurable per linux distribution. --- install/dist/conf/centos52.conf.php | 4 ++++ install/dist/conf/debian40.conf.php | 3 +++ install/dist/conf/fedora9.conf.php | 3 +++ install/dist/conf/opensuse110.conf.php | 3 +++ install/dist/lib/fedora.lib.php | 3 ++- install/lib/installer_base.lib.php | 3 ++- 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index c74e5ed700..b98c51692d 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -82,6 +82,9 @@ $conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/httpd/conf/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +//* Fastcgi +$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/'; + //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation $conf['postfix']['config_dir'] = '/etc/postfix'; @@ -139,4 +142,5 @@ $conf['jailkit']['jk_init'] = 'jk_init.ini'; $conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini'; $conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /bin/basename /usr/bin/dirname /usr/bin/nano'; + ?> \ No newline at end of file diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php index 7d63329548..6d6512f331 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -82,6 +82,9 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +//* Fastcgi +$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/'; + //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation $conf['postfix']['config_dir'] = '/etc/postfix'; diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php index 29934d49fe..b40f1cb68e 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -82,6 +82,9 @@ $conf['apache']['vhost_conf_dir'] = '/etc/httpd/conf/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/httpd/conf/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +//* Fastcgi +$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/'; + //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation $conf['postfix']['config_dir'] = '/etc/postfix'; diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php index 202e628b3c..ff89631c97 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -82,6 +82,9 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +//* Fastcgi +$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/'; + //* Postfix $conf['postfix']['installed'] = false; // will be detected automatically during installation $conf['postfix']['config_dir'] = '/etc/postfix'; diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 0feb89e13a..1063151d8b 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -681,7 +681,6 @@ class installer_dist extends installer_base { // Dont just copy over the virtualhost template but add some custom settings - $content = rf("tpl/apache_ispconfig.vhost.master"); $content = str_replace('{vhost_port}', $conf['apache']['vhost_port'], $content); @@ -708,6 +707,8 @@ class installer_dist extends installer_base { exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig'); 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); + } //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost"); diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index a13bdb984f..a131153e68 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -202,7 +202,8 @@ class installer_base { // TODO: Update further distribution specific parameters for server config here $tpl_ini_array['web']['vhost_conf_dir'] = $conf['apache']['vhost_conf_dir']; $tpl_ini_array['web']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_enabled_dir']; - $tpl_ini_array['web']['jailkit_chroot_app_programs'] = $conf['jailkit']['jailkit_chroot_app_programs']; + $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']; $server_ini_content = array_to_ini($tpl_ini_array); -- GitLab