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

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