diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php index 429ea2ef458555e96175661c4d3d841b4ac74584..e2844a9f80e5ebb94a8fd5a39117b948a75a3030 100644 --- a/install/dist/conf/centos52.conf.php +++ b/install/dist/conf/centos52.conf.php @@ -81,6 +81,8 @@ $conf['apache']['version'] = '2.2'; $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 429ea2ef458555e96175661c4d3d841b4ac74584..e2844a9f80e5ebb94a8fd5a39117b948a75a3030 100644 --- a/install/dist/conf/centos53.conf.php +++ b/install/dist/conf/centos53.conf.php @@ -81,6 +81,8 @@ $conf['apache']['version'] = '2.2'; $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 ca959bbcbd8fdebb68811c5604c1dcecf2db7c90..e2b2952b59400792eb645a30f7c850eb30b6a4cb 100644 --- a/install/dist/conf/debian40.conf.php +++ b/install/dist/conf/debian40.conf.php @@ -81,6 +81,8 @@ $conf['apache']['version'] = '2.2'; $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 ca959bbcbd8fdebb68811c5604c1dcecf2db7c90..e2b2952b59400792eb645a30f7c850eb30b6a4cb 100644 --- a/install/dist/conf/debian60.conf.php +++ b/install/dist/conf/debian60.conf.php @@ -81,6 +81,8 @@ $conf['apache']['version'] = '2.2'; $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 7642983aa1aec1157039f14a855a101af09b3e89..4a2944cfdf8c172c73864fe4a8bcddb9913006c3 100644 --- a/install/dist/conf/fedora9.conf.php +++ b/install/dist/conf/fedora9.conf.php @@ -81,6 +81,8 @@ $conf['apache']['version'] = '2.2'; $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 69b9ea38d6ef65db5c15b7f93390a8cbfda0da0e..7add51ae26a20b3c52f7ba81228f3b8a9dc406e0 100644 --- a/install/dist/conf/gentoo.conf.php +++ b/install/dist/conf/gentoo.conf.php @@ -88,6 +88,8 @@ $conf['apache']['vhost_conf_dir'] = $conf['apache']['config_dir'] . '/vhosts.d'; $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 140692aec634ac00c76b1494b18b18bd13be637c..40a884fbe4789ca03201bd41cfc37326d43c497c 100644 --- a/install/dist/conf/opensuse110.conf.php +++ b/install/dist/conf/opensuse110.conf.php @@ -81,6 +81,8 @@ $conf['apache']['version'] = '2.2'; $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 9f590e6ad8c04b3b03592110c22baffb21cfc1c2..153b2329813d07444a4bc7a334db21c02301f01b 100644 --- a/install/dist/conf/opensuse112.conf.php +++ b/install/dist/conf/opensuse112.conf.php @@ -81,6 +81,8 @@ $conf['apache']['version'] = '2.2'; $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 e242c6429fe3170e8ba48408100f2207d520c518..b49310c1ebc48cb871786694a5f545e39d0eaafb 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -211,6 +211,8 @@ class installer_base { $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'];