Convert php::fpm from class to resource

diff --git a/manifests/fpm.pp b/manifests/fpm.pp
index 1fb3d0cb55419996baa15cb9d3d97924e32e1a1a..054b27f3475531108da41faa3371c51aad9c43c7 100644 (file)
--- a/manifests/fpm.pp
+++ b/manifests/fpm.pp
@@ -1,4 +1,5 @@
-class php::fpm(
+define php::fpm(
+  $series,
   $ensure = 'present',
 ) {
   $series = $::php::series
@@ -12,7 +13,7 @@ class php::fpm(
     $folder  = $::php::series7::folder
   }
 
-  package { 'php-fpm':
+  package { "php${version}-fpm":
     ensure => $ensure,
   }
 

diff --git a/manifests/init.pp b/manifests/init.pp
index 7d07c877a56164938bf0e564bc2c3d5744d8f6b5..3f8e07512c2518924aa2f91750ddaf3f9e631754 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,7 +30,8 @@ class php(
     ensure => $apc,
   }
 
-  class { 'php::fpm':
+  php::fpm { $series:
+    series => $series,
     ensure => $fpm,
   }
 }