Merge pull request #91 from schkovich/master

params on php::fpm are not used #81

manifests/fpm.pp

@@ -40,16 +40,30 @@
 # Copyright 2012-2013 Christian "Jippi" Winther, unless otherwise noted.
 #
 class php::fpm(
-  $ensure       = $php::fpm::params::ensure,
-  $package      = $php::fpm::params::package,
-  $provider     = $php::fpm::params::provider,
-  $inifile      = $php::fpm::params::inifile,
-  $settings     = $php::fpm::params::settings,
-  $service_name = $php::fpm::params::service_name
+  $ensure             = $php::fpm::params::ensure,
+  $package            = $php::fpm::params::package,
+  $provider           = $php::fpm::params::provider,
+  $inifile            = $php::fpm::params::inifile,
+  $settings           = $php::fpm::params::settings,
+  $service_name       = $php::fpm::params::service_name,
+  $service_ensure     = $php::fpm::params::service_ensure,
+  $service_enable     = $php::fpm::params::service_enable,
+  $service_has_status = $php::fpm::params::service_has_status
 ) inherits php::fpm::params {
 
-  include php::fpm::package
-  include php::fpm::service
+  class  { 'php::fpm::package':
+    package_name => $package,
+    package_ensure => $ensure,
+    package_provider => $provider
+  }
+
+  class  { "php::fpm::service":
+    service_name => $service_name,
+    ensure => $service_ensure,
+    enable => $service_enable,
+    has_status => $service_has_status,
+    require => Package[$package]
+  }
 
   php::fpm::config { 'php-fpm':
     file    => $inifile,

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',
   }
 }

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:

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
   }
 
 }