Fix php-fpm service requirements

diff --git a/manifests/config.pp b/manifests/config.pp
index 93c0e5be94df0b2bd7a1d221e7bbf4ad4d510eff..ca307e34b8ec1a26b108bb7147f211b596fbb3da 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,9 +1,11 @@
 define php::config($series = '5', $order = '20', $value, $ensure = 'present', $sapi = 'apache2') {
   if $series == '5' {
-    $folder = $::php::series5::folder
+    $version = $::php::series5::version
+    $folder  = $::php::series5::folder
   }
   else {
-    $folder = $::php::series7::folder
+    $version = $::php::series7::version
+    $folder  = $::php::series7::folder
   }
 
   file { "${folder}/${sapi}/conf.d/${order}-${name}.ini":
@@ -15,6 +17,7 @@ define php::config($series = '5', $order = '20', $value, $ensure = 'present', $s
     require => File["${folder}/${sapi}/conf.d"],
     notify  => $sapi ? {
       'apache2' => Service['apache2'],
+      'fpm'     => Service["php${version}-fpm"],
       default   => undef,
     },
   }

diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp
index 75560db25e02c57a240c1d21bc2f8b217c14faee..d587dff9b98526802eb315d2cbd71e4cc2c47660 100644 (file)
--- a/manifests/fpm/pool.pp
+++ b/manifests/fpm/pool.pp
@@ -17,6 +17,6 @@ define php::fpm::pool(
     ensure  => $ensure,
     source  => $source,
     require => Package['php-fpm'],
-    notify  => Service["php-${version}-fpm"],
+    notify  => Service["php${version}-fpm"],
   }
 }