Merge aaf802e into a87005f

voxpupuli · Nov 17, 2016 · 64abada · 64abada
2 parents a87005f + aaf802e
commit 64abada
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/manifests/global.pp b/manifests/global.pp
@@ -12,9 +12,9 @@
 
 #
 class php::global(
-  $inifile  = $::php::params::config_root_inifile,
+  $inifile  = $::php::config_root_inifile,
   $settings = {}
-) inherits ::php::params {
+) inherits ::php {
 
   if $caller_module_name != $module_name {
     warning('php::global is private')

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -78,6 +78,10 @@
 #   to a sensible default depending on your operating system, like
 #   '/etc/php5/mods-available' or '/etc/php5/conf.d'.
 #
+# [*config_root_inifile*]
+#   The path to the global php.ini file. This defaults to a sensible default
+#   depending on your operating system.
+#
 # [*ext_tool_enable*]
 #   Absolute path to php tool for enabling extensions in debian/ubuntu systems.
 #   This defaults to '/usr/sbin/php5enmod'.
@@ -129,6 +133,7 @@
   $settings                 = {},
   $package_prefix           = $::php::params::package_prefix,
   $config_root_ini          = $::php::params::config_root_ini,
+  $config_root_inifile      = $::php::params::config_root_inifile,
   $ext_tool_enable          = $::php::params::ext_tool_enable,
   $ext_tool_query           = $::php::params::ext_tool_query,
   $ext_tool_enabled         = $::php::params::ext_tool_enabled,
@@ -154,10 +159,9 @@
   validate_hash($fpm_global_pool_settings)
   validate_string($log_owner)
   validate_string($log_group)
+  validate_absolute_path($config_root_ini)
+  validate_absolute_path($config_root_inifile)
 
-  if $config_root_ini != undef {
-    validate_absolute_path($config_root_ini)
-  }
   if $ext_tool_enable != undef {
     validate_absolute_path($ext_tool_enable)
   }