From 567d81c23d9a5f09658c09c3666d7a6f65b34f18 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 22 Jun 2018 18:27:05 -0300
Subject: Support multiple PHP series at the same time, currently only 5 and 7

---
 manifests/series7.pp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'manifests/series7.pp')

diff --git a/manifests/series7.pp b/manifests/series7.pp
index 38b82d1..d6af596 100644
--- a/manifests/series7.pp
+++ b/manifests/series7.pp
@@ -14,7 +14,7 @@ class php::series7(
     }
   }
 
-  $version = '7.2'
+  $version = $::php::params::version7
   $folder  = "/etc/php/${version}"
 
   include php::series7::packages
@@ -26,11 +26,18 @@ class php::series7(
   }
 
   # The needed apache modules
-  if $manage_mod_php == true {
+  if $manage_mod_php == '7' {
+    $version5 = $::php::params::version5
+
     apache::module { "php${version}":
       ensure  => present,
       require => Package["libapache2-mod-php${version}"],
     }
+
+    apache::module { "php${version5}":
+      ensure  => absent,
+      require => Package["libapache2-mod-php${version}"],
+    }
   }
 
   file { [ "${folder}", "${folder}/cli", "${folder}/apache2", "${folder}/cli/conf.d", "${folder}/apache2/conf.d" ]:
-- 
cgit v1.2.3