Fix service name for series 5 and 7 at php::apc

diff --git a/manifests/apc.pp b/manifests/apc.pp
index 34bb6a29b84f05b88e0259b565adf346647c08b9..70b17ebec9d91a5ca240a08e02e06dbc282ce2df 100644 (file)
--- a/manifests/apc.pp
+++ b/manifests/apc.pp
@@ -1,11 +1,14 @@
 class php::apc(
   $ensure = 'present',
 ) {
-  $fpm              = $::php::fpm
-  $series           = $::php::series
-  $services_version = regsubst($series,           '5', '5.6')
-  $services_name    = regsubst($services_version, '^', 'php')
-  $services         = regsubst($services_name,    '$', '-fpm')
+  $fpm                = $::php::fpm
+  $version5           = $::php::params::version5
+  $version7           = $::php::params::version7
+  $series             = $::php::series
+  $services_version_5 = regsubst($series,             '^5$', $version5)
+  $services_version_7 = regsubst($services_version_5, '^7$', $version7)
+  $services_name      = regsubst($services_version_7, '^',   'php')
+  $services           = regsubst($services_name,      '$',   '-fpm')
 
   package { [ 'php-apcu', 'php-apcu-bc' ]:
     ensure => $ensure,