From 230217fc226ab4cb7d08c53ddd0e24efb1b5bcce Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 8 May 2020 16:33:49 -0300 Subject: Fix: manage_mod_php behavior --- manifests/params.pp | 6 +++--- manifests/series5.pp | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 155a5c1..68f561c 100644 --- 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 6ccf2a0..3f45a0d 100644 --- 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}"], -- cgit v1.2.3