From ef26298b6340fdc8d180c4b534f90e0da07113aa Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 14 Sep 2018 17:16:54 -0300
Subject: Fix service name for series 5 and 7 at php::apc

---
 manifests/apc.pp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/manifests/apc.pp b/manifests/apc.pp
index 34bb6a2..70b17eb 100644
--- 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,
-- 
cgit v1.2.3