From 15c20395af945f9d63940ab8fc7711427141c6ad Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Fri, 14 Sep 2018 14:34:44 -0300 Subject: Avoid dependency lookup error for /etc/apt/sources.list.d/php.list at php::packages --- manifests/dpa.pp | 2 ++ manifests/ppa.pp | 2 ++ manifests/series5/packages.pp | 2 +- manifests/series7/packages.pp | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/manifests/dpa.pp b/manifests/dpa.pp index 8292d61..1f9d170 100644 --- a/manifests/dpa.pp +++ b/manifests/dpa.pp @@ -22,4 +22,6 @@ class php::dpa { user => "root", refreshonly => true, } + + include php::packages } diff --git a/manifests/ppa.pp b/manifests/ppa.pp index 1166439..2d7eabd 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -35,4 +35,6 @@ class php::ppa { user => "root", refreshonly => true, } + + include php::packages } diff --git a/manifests/series5/packages.pp b/manifests/series5/packages.pp index 373a655..115303d 100644 --- a/manifests/series5/packages.pp +++ b/manifests/series5/packages.pp @@ -1,4 +1,4 @@ -class php::series5::packages inherits php::packages { +class php::series5::packages { $version = $::php::params::version5 # The needed packages: we could also try libapache2-mod-php5.6filter diff --git a/manifests/series7/packages.pp b/manifests/series7/packages.pp index 1f1d635..7580ec1 100644 --- a/manifests/series7/packages.pp +++ b/manifests/series7/packages.pp @@ -1,4 +1,4 @@ -class php::series7::packages inherits php::packages { +class php::series7::packages { $version = $::php::params::version7 package { [ "php${version}-common", "php${version}-mysql", "php${version}-cli", "php${version}-curl", 'php-gmp', 'php-xml', "libapache2-mod-php${version}" ]: -- cgit v1.2.3