Fix: manage_mod_php behavior

diff --git a/manifests/params.pp b/manifests/params.pp
index 155a5c1cc4a87be4208addbb85cc5c3411907b92..68f561cf71494eca1e8ddeb7540e0f1efe5f4453 100644 (file)
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -6,9 +6,9 @@ class php::params {
   }
 
   $version7_previous = $::lsbdistcodename ? {
-    'buster'  => '7.3',
-    'stretch' => '7.3',
-    default   => '7.3',
+    'buster'  => [ '7.3', '7.2', '7.1', '7.0' ],
+    'stretch' => [ '7.3', '7.2', '7.1', '7.0' ],
+    default   => [ '7.3', '7.2', '7.1', '7.0' ],
   }
 
   $version5 = $::lsbdistcodename ? {

diff --git a/manifests/series5.pp b/manifests/series5.pp
index 6ccf2a092d331bb1de1706b12d78cba7dd952dab..3f45a0d07e7d3b7df25f972ba87dffa95dc41dce 100644 (file)
--- a/manifests/series5.pp
+++ b/manifests/series5.pp
@@ -78,6 +78,12 @@ class php::series5(
       require => Package["libapache2-mod-php${version}"],
     }
 
+    $::php::params::version7_previous.each |$item| {
+      apache::module { "php${item}":
+        ensure => absent,
+      }
+    }
+
     apache::module { "php${version7}":
       ensure  => absent,
       require => Package["libapache2-mod-php${version}"],