params on php::fpm are not used jippi#81

Making php::fpm a single installation entry point.
schkovich · Aug 23, 2014 · ea1ead5 · joshbetz · Feb 16, 2015 · schkovich
1 parent 066c5ed
commit ea1ead5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/manifests/fpm.pp b/manifests/fpm.pp
@@ -61,12 +61,14 @@
     service_name => $service_name,
     ensure => $service_ensure,
     enable => $service_enable,
-    has_status => $service_has_status
+    has_status => $service_has_status,
+    require => Package[$package]
   }
 
   php::fpm::config { 'php-fpm':
     file    => $inifile,
-    config  => $settings
+    config  => $settings,
+    require => Package[$package]
   }
 
 }
diff --git a/manifests/fpm/config.pp b/manifests/fpm/config.pp
@@ -34,6 +34,7 @@
   $setting  = undef,
   $section  = 'PHP',
   $value    = undef,
+  $service_name = $::php::fpm::params::service_name
 ) {
   include ::php::fpm::params
 
@@ -44,7 +45,7 @@
     section => $section,
     setting => $setting,
     value   => $value,
-    notify  => Service[$::php::fpm::params::service_name],
+    notify  => Service[$service_name],
     source  => 'fpm',
   }
 }
diff --git a/manifests/fpm/package.pp b/manifests/fpm/package.pp
@@ -1,7 +1,7 @@
 class php::fpm::package(
-  $package_name     = $php::fpm::params::package,
-  $package_ensure   = $php::fpm::params::ensure,
-  $package_provider = $php::fpm::params::provider
+  $package_name,
+  $package_ensure,
+  $package_provider
 ) {
 
   package { $package_name:

diff --git a/manifests/fpm/service.pp b/manifests/fpm/service.pp
@@ -1,16 +1,15 @@
 class php::fpm::service(
-  $service_name = $php::fpm::params::service_name,
-  $ensure       = $php::fpm::params::service_ensure,
-  $enable       = $php::fpm::params::service_enable,
-  $has_status   = $php::fpm::params::service_has_status
-) inherits php::fpm::params {
+  $service_name,
+  $ensure,
+  $enable,
+  $has_status,
+) {
 
   service { $service_name:
     ensure    => $ensure,
     enable    => $enable,
     restart   => "service ${service_name} reload",
-    hasstatus => $has_status,
-    require   => Package[$package]
+    hasstatus => $has_status
   }
 
 }