Fixing the references to Package['php'] with Package[::package]

example42 · Aug 26, 2015 · a181e33 · a181e33
1 parent 951e5da
commit a181e33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/manifests/ini.pp b/manifests/ini.pp
@@ -27,7 +27,8 @@
   $target       = 'extra.ini',
   $sapi_target  = 'all',
   $service      = $php::service,
-  $config_dir   = $php::config_dir
+  $config_dir   = $php::config_dir,
+  $package      = $php::package
 ) {
 
   include php
@@ -42,14 +43,14 @@
     file { "${config_dir}${http_sapi}conf.d/${target}":
       ensure  => 'present',
       content => template($template),
-      require => Package['php'],
+      require => Package[$package],
       before  => File["${config_dir}/cli/conf.d/${target}"],
     }
 
     file { "${config_dir}/cli/conf.d/${target}":
       ensure  => 'present',
       content => template($template),
-      require => Package['php'],
+      require => Package[$package],
       notify  => Service[$service],
     }
 
@@ -58,7 +59,7 @@
     file { "${config_dir}/${sapi_target}/conf.d/${target}":
       ensure  => 'present',
       content => template($template),
-      require => Package['php'],
+      require => Package[$package],
       notify  => Service[$service],
     }
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -260,7 +260,7 @@
     mode    => $php::config_file_mode,
     owner   => $php::config_file_owner,
     group   => $php::config_file_group,
-    require => Package['php'],
+    require => Package[$php::package],
     source  => $php::manage_file_source,
     content => $php::manage_file_content,
     replace => $php::manage_file_replace,
@@ -273,7 +273,7 @@
     file { 'php.dir':
       ensure  => directory,
       path    => $php::config_dir,
-      require => Package['php'],
+      require => Package[$php::package],
       source  => $php::source_dir,
       recurse => true,
       links   => follow,

diff --git a/manifests/mod.pp b/manifests/mod.pp
@@ -38,7 +38,8 @@
 define php::mod (
   $disable              = false,
   $service_autorestart  = '',
-  $path                 = '/usr/bin:/bin:/usr/sbin:/sbin'
+  $path                 = '/usr/bin:/bin:/usr/sbin:/sbin',
+  $package              = $php::package
   ) {
 
   include php
@@ -62,7 +63,7 @@
     command => "${php_mod_tool} ${name}",
     path    => $path,
     notify  => $real_service_autorestart,
-    require => Package['php'],
+    require => Package[$package],
   }
 
 }
diff --git a/manifests/module.pp b/manifests/module.pp
@@ -50,7 +50,8 @@
   $install_options     = [],
   $service_autorestart = '',
   $module_prefix       = '',
-  $absent              = ''
+  $absent              = '',
+  $package             = $php::package
   ) {
 
   include php
@@ -88,7 +89,7 @@
       name            => $real_install_package,
       notify          => $real_service_autorestart,
       install_options => $real_install_options,
-      require         => Package['php'],
+      require         => Package[$package],
     }
   }