Merge pull request #398 from DALUofM/master

Change default RedHat params to use config_root

manifests/globals.pp

@@ -104,7 +104,7 @@ class php::globals (
       }
     }
     'RedHat': {
-      $default_config_root  = '/etc/php.d'
+      $default_config_root  = '/etc'
       $default_fpm_pid_file = '/var/run/php-fpm/php-fpm.pid'
     }
     'FreeBSD': {

manifests/params.pp

@@ -101,24 +101,25 @@ class php::params inherits php::globals {
       }
     }
     'RedHat': {
-      $config_root_ini         = '/etc/php.d'
-      $config_root_inifile     = '/etc/php.ini'
+      $config_root             = $php::globals::globals_config_root
+      $config_root_ini         = "${config_root}/php.d"
+      $config_root_inifile     = "${config_root}/php.ini"
       $common_package_names    = []
       $common_package_suffixes = ['cli', 'common']
-      $cli_inifile             = '/etc/php-cli.ini'
+      $cli_inifile             = "${config_root}/php-cli.ini"
       $dev_package_suffix      = 'devel'
       $fpm_pid_file            = $php::globals::globals_fpm_pid_file
-      $fpm_config_file         = '/etc/php-fpm.conf'
+      $fpm_config_file         = "${config_root}/php-fpm.conf"
       $fpm_error_log           = '/var/log/php-fpm/error.log'
-      $fpm_inifile             = '/etc/php-fpm.ini'
+      $fpm_inifile             = "${config_root}/php-fpm.ini"
       $fpm_package_suffix      = 'fpm'
-      $fpm_pool_dir            = '/etc/php-fpm.d'
+      $fpm_pool_dir            = "${config_root}/php-fpm.d"
       $fpm_service_name        = 'php-fpm'
       $fpm_user                = 'apache'
       $fpm_group               = 'apache'
-      $apache_inifile          = '/etc/php.ini'
+      $apache_inifile          = "${config_root}/php.ini"
       $embedded_package_suffix = 'embedded'
-      $embedded_inifile        = '/etc/php.ini'
+      $embedded_inifile        = "${config_root}/php.ini"
       $package_prefix          = 'php-'
       $compiler_packages       = ['gcc', 'gcc-c++', 'make']
       $manage_repos            = false