Support multiple PHP series at the same time, currently only 5 and 7

1 files changed, 10 insertions, 9 deletions

diff --git a/manifests/series5.pp b/manifests/series5.pp
index e39dd8b..4202592 100644
--- a/manifests/series5.pp
+++ b/manifests/series5.pp
@@ -14,14 +14,8 @@ class php::series5(
     }
   }
 
-  $version = $::lsbdistcodename ? {
-    'xenial'  => '5.6',
-    'trusty'  => '5.6',
-    'stretch' => '5.6',
-    default   => '5',
-  }
-
-  $folder = $::lsbdistcodename ? {
+  $version = $::php::params::version5
+  $folder  = $::lsbdistcodename ? {
     'xenial'  => "/etc/php/${version}",
     'trusty'  => "/etc/php/${version}",
     'stretch' => "/etc/php/${version}",
@@ -72,10 +66,17 @@ class php::series5(
   }
 
   # The needed apache modules
-  if $manage_mod_php == true {
+  if $manage_mod_php == '5' {
+    $version7 = $::php::params::version7
+
     apache::module { "php${version}":
       ensure  => present,
       require => Package["libapache2-mod-php${version}"],
     }
+
+    apache::module { "php${version7}":
+      ensure  => absent,
+      require => Package["libapache2-mod-php${version}"],
+    }
   }
 }