Added distribution specific default settings for cgi and apache php.ini.

Author: tbrehm

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';

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';

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';

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';

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';

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';

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';

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';

install/lib/installer_base.lib.php

@@ -211,6 +211,8 @@ public function add_database_server_record() {
 		$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'];