aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-06-22 13:40:55 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-06-22 13:40:55 -0300
commit30086d6f7a6691dabbad397b1b6b8c899af15cfa (patch)
tree34b247862e95f456f7a9f153d7354ee3223657c6 /manifests
parent7f820fa183f48266879027119869f20c401c06e1 (diff)
downloadpuppet-php-30086d6f7a6691dabbad397b1b6b8c899af15cfa.tar.gz
puppet-php-30086d6f7a6691dabbad397b1b6b8c899af15cfa.tar.bz2
Fix duplicate definition and resource name
Diffstat (limited to 'manifests')
-rw-r--r--manifests/init.pp2
-rw-r--r--manifests/series5/packages.pp6
2 files changed, 1 insertions, 7 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 3f8e075..b60d3df 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -30,7 +30,7 @@ class php(
ensure => $apc,
}
- php::fpm { $series:
+ php::fpm { "php-fpm-${series}":
series => $series,
ensure => $fpm,
}
diff --git a/manifests/series5/packages.pp b/manifests/series5/packages.pp
index 2d7e196..2b7dd3d 100644
--- a/manifests/series5/packages.pp
+++ b/manifests/series5/packages.pp
@@ -32,12 +32,6 @@ class php::series5::packages {
ensure => absent,
}
- # The needed apache modules
- apache::module { 'php5.6':
- ensure => present,
- require => [ Package['libapache2-mod-php5.6'], Apache::Module['php5'] ],
- }
-
# Default alternative
file { "/etc/alternatives/php":
ensure => "/usr/bin/php5.6",