aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2018-06-18 13:16:08 -0300
committerSilvio Rhatto <rhatto@riseup.net>2018-06-18 13:16:08 -0300
commit9f1f1c7746a6305b328eaef9bf28057cb44971fe (patch)
tree11f6123525f547979ad8468ff696e3467a0d65eb
parentc8318aff07147665f1f5887fe17c4a4a8c631124 (diff)
downloadpuppet-php-9f1f1c7746a6305b328eaef9bf28057cb44971fe.tar.gz
puppet-php-9f1f1c7746a6305b328eaef9bf28057cb44971fe.tar.bz2
Fixes for php::fpm
-rw-r--r--manifests/fpm.pp6
1 files changed, 2 insertions, 4 deletions
diff --git a/manifests/fpm.pp b/manifests/fpm.pp
index 054b27f..4009360 100644
--- a/manifests/fpm.pp
+++ b/manifests/fpm.pp
@@ -2,8 +2,6 @@ define php::fpm(
$series,
$ensure = 'present',
) {
- $series = $::php::series
-
if $series == '5' {
$version = $::php::series5::version
$folder = $::php::series5::folder
@@ -22,7 +20,7 @@ define php::fpm(
'present' => running,
default => undef,
},
- require => Package['php-fpm'],
+ require => Package["php${version}-fpm"],
}
#apache::module { [ "proxy_fcgi", "setenvif" ]:
@@ -36,6 +34,6 @@ define php::fpm(
'present' => present,
default => undef,
},
- require => Package['php-fpm'],
+ require => Package["php${version}-fpm"],
}
}