From e81bf96ce0818c630e00952513dbe3dc7d5d3a31 Mon Sep 17 00:00:00 2001 From: tbrehm <t.brehm@ispconfig.org> Date: Thu, 08 Jul 2010 10:19:16 -0400 Subject: [PATCH] Added distribution specific default settings for cgi and apache php.ini. --- install/dist/conf/centos53.conf.php | 2 ++ install/lib/installer_base.lib.php | 2 ++ install/dist/conf/fedora9.conf.php | 2 ++ install/dist/conf/opensuse110.conf.php | 2 ++ install/dist/conf/opensuse112.conf.php | 2 ++ install/dist/conf/debian40.conf.php | 2 ++ install/dist/conf/gentoo.conf.php | 2 ++ install/dist/conf/debian60.conf.php | 2 ++ install/dist/conf/centos52.conf.php | 2 ++ 9 files changed, 18 insertions(+), 0 deletions(-) diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index 429ea2e..e2844a9 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -81,6 +81,8 @@ $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'; +$conf['apache']['php_ini_path_apache'] = '/etc/php5/apache2/php.ini'; +$conf['apache']['php_ini_path_cgi'] = '/etc/php5/cgi/php.ini'; //* Website base settings $conf['web']['website_basedir'] = '/var/www'; diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php index 429ea2e..e2844a9 100644 --- a/install/dist/conf/centos53.conf.php +++ b/install/dist/conf/centos53.conf.php @@ -81,6 +81,8 @@ $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'; +$conf['apache']['php_ini_path_apache'] = '/etc/php5/apache2/php.ini'; +$conf['apache']['php_ini_path_cgi'] = '/etc/php5/cgi/php.ini'; //* Website base settings $conf['web']['website_basedir'] = '/var/www'; diff --git a/install/dist/conf/debian40.conf.php b/install/dist/conf/debian40.conf.php index ca959bb..e2b2952 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -81,6 +81,8 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +$conf['apache']['php_ini_path_apache'] = '/etc/php5/apache2/php.ini'; +$conf['apache']['php_ini_path_cgi'] = '/etc/php5/cgi/php.ini'; //* Website base settings $conf['web']['website_basedir'] = '/var/www'; diff --git a/install/dist/conf/debian60.conf.php b/install/dist/conf/debian60.conf.php index ca959bb..e2b2952 100644 --- a/install/dist/conf/debian60.conf.php +++ b/install/dist/conf/debian60.conf.php @@ -81,6 +81,8 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +$conf['apache']['php_ini_path_apache'] = '/etc/php5/apache2/php.ini'; +$conf['apache']['php_ini_path_cgi'] = '/etc/php5/cgi/php.ini'; //* Website base settings $conf['web']['website_basedir'] = '/var/www'; diff --git a/install/dist/conf/fedora9.conf.php b/install/dist/conf/fedora9.conf.php index 7642983..4a2944c 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -81,6 +81,8 @@ $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'; +$conf['apache']['php_ini_path_apache'] = '/etc/php5/apache2/php.ini'; +$conf['apache']['php_ini_path_cgi'] = '/etc/php5/cgi/php.ini'; //* Website base settings $conf['web']['website_basedir'] = '/var/www'; diff --git a/install/dist/conf/gentoo.conf.php b/install/dist/conf/gentoo.conf.php index 69b9ea3..7add51a 100644 --- a/install/dist/conf/gentoo.conf.php +++ b/install/dist/conf/gentoo.conf.php @@ -88,6 +88,8 @@ $conf['apache']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_dir']; $conf['apache']['vhost_default'] = '00_default_vhost.conf'; $conf['apache']['vhost_port'] = '8080'; +$conf['apache']['php_ini_path_apache'] = '/etc/php5/apache2/php.ini'; +$conf['apache']['php_ini_path_cgi'] = '/etc/php5/cgi/php.ini'; //* Website base settings $conf['web']['website_basedir'] = '/var/www'; diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php index 140692a..40a884f 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -81,6 +81,8 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +$conf['apache']['php_ini_path_apache'] = '/etc/php5/apache2/php.ini'; +$conf['apache']['php_ini_path_cgi'] = '/etc/php5/apache2/php.ini'; //* Website base settings $conf['web']['website_basedir'] = '/srv/www'; diff --git a/install/dist/conf/opensuse112.conf.php b/install/dist/conf/opensuse112.conf.php index 9f590e6..153b232 100644 --- a/install/dist/conf/opensuse112.conf.php +++ b/install/dist/conf/opensuse112.conf.php @@ -81,6 +81,8 @@ $conf['apache']['vhost_conf_dir'] = '/etc/apache2/sites-available'; $conf['apache']['vhost_conf_enabled_dir'] = '/etc/apache2/sites-enabled'; $conf['apache']['vhost_port'] = '8080'; +$conf['apache']['php_ini_path_apache'] = '/etc/php5/apache2/php.ini'; +$conf['apache']['php_ini_path_cgi'] = '/etc/php5/apache2/php.ini'; //* Website base settings $conf['web']['website_basedir'] = '/srv/www'; diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index e242c64..b49310c 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -211,6 +211,8 @@ $tpl_ini_array['web']['security_level'] = 20; $tpl_ini_array['web']['user'] = $conf['apache']['user']; $tpl_ini_array['web']['group'] = $conf['apache']['group']; + $tpl_ini_array['web']['php_ini_path_apache'] = $conf['apache']['php_ini_path_apache']; + $tpl_ini_array['web']['php_ini_path_cgi'] = $conf['apache']['php_ini_path_cgi']; $tpl_ini_array['mail']['pop3_imap_daemon'] = ($conf['dovecot']['installed'] == true)?'dovecot':'courier'; $tpl_ini_array['mail']['mail_filter_syntax'] = ($conf['dovecot']['installed'] == true)?'sieve':'maildrop'; $tpl_ini_array['dns']['bind_user'] = $conf['bind']['bind_user']; -- Gitblit v1.9.1