Fixes for php::fpm

diff --git a/manifests/fpm.pp b/manifests/fpm.pp
index 054b27f3475531108da41faa3371c51aad9c43c7..40093608930b159f4bc18fc3c993e4ea43502f1a 100644 (file)
--- a/manifests/fpm.pp
+++ b/manifests/fpm.pp
@@ -2,8 +2,6 @@ define php::fpm(
   $series,
   $ensure = 'present',
 ) {
-  $series = $::php::series
-
   if $series == '5' {
     $version = $::php::series5::version
     $folder  = $::php::series5::folder
@@ -22,7 +20,7 @@ define php::fpm(
       'present' => running,
       default   => undef,
     },
-    require => Package['php-fpm'],
+    require => Package["php${version}-fpm"],
   }
 
   #apache::module { [ "proxy_fcgi", "setenvif" ]:
@@ -36,6 +34,6 @@ define php::fpm(
       'present' => present,
       default   => undef,
     },
-    require => Package['php-fpm'],
+    require => Package["php${version}-fpm"],
   }
 }