aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
Diffstat (limited to 'manifests')
-rw-r--r--manifests/dpa.pp4
-rw-r--r--manifests/ppa.pp4
-rw-r--r--manifests/series5/packages.pp2
-rw-r--r--manifests/series7/packages.pp2
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}" ]: