Avoid dependency lookup error for /etc/apt/sources.list.d/php.list at php::packages (2)

diff --git a/manifests/dpa.pp b/manifests/dpa.pp
index 1f9d1706953337c49e44a98885b6d204c7aad3e0..619cd0ab0b7994f3bf069f8bfd14ca6cfc5909d9 100644 (file)
--- 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 2d7eabd58b1c941a72a9dca3278340af2e745b21..591844c0f2c4fd393bd2972928bc85cd8c2fb0fe 100644 (file)
--- 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 115303de2a7e474eacb820c81d1993511bb8e01f..373a655c524c2c7974aa66bf41b68291aa2aced3 100644 (file)
--- 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 7580ec1fa162e655cb485b27a45928de5fc44615..1f1d635209a029b43d70520879c3deeacb000ae8 100644 (file)
--- 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}" ]: