From 0c815b656e93e18f7fb6b72c0be4e51069799abe Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 14 Sep 2018 14:36:48 -0300
Subject: Avoid dependency lookup error for /etc/apt/sources.list.d/php.list at
 php::packages (2)

---
 manifests/dpa.pp              | 4 +---
 manifests/ppa.pp              | 4 +---
 manifests/series5/packages.pp | 2 +-
 manifests/series7/packages.pp | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/manifests/dpa.pp b/manifests/dpa.pp
index 1f9d170..619cd0a 100644
--- a/manifests/dpa.pp
+++ b/manifests/dpa.pp
@@ -1,4 +1,4 @@
-class php::dpa {
+class php::dpa inherits php::packages {
   file { '/etc/apt/trusted.gpg.d/deb.sury.org-php.gpg':
     ensure  => present,
     owner   => "root",
@@ -22,6 +22,4 @@ class php::dpa {
     user        => "root",
     refreshonly => true,
   }
-
-  include php::packages
 }
diff --git a/manifests/ppa.pp b/manifests/ppa.pp
index 2d7eabd..591844c 100644
--- a/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@ -1,4 +1,4 @@
-class php::ppa {
+class php::ppa inherits php::packages {
   #package { 'python-software-properties':
   #  ensure => present,
   #}
@@ -35,6 +35,4 @@ class php::ppa {
     user        => "root",
     refreshonly => true,
   }
-
-  include php::packages
 }
diff --git a/manifests/series5/packages.pp b/manifests/series5/packages.pp
index 115303d..373a655 100644
--- a/manifests/series5/packages.pp
+++ b/manifests/series5/packages.pp
@@ -1,4 +1,4 @@
-class php::series5::packages {
+class php::series5::packages inherits php::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 7580ec1..1f1d635 100644
--- a/manifests/series7/packages.pp
+++ b/manifests/series7/packages.pp
@@ -1,4 +1,4 @@
-class php::series7::packages {
+class php::series7::packages inherits php::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