From acbdb94038a2fc39a1b26f1c5af761115158806b Mon Sep 17 00:00:00 2001 From: Martin Loy Date: Tue, 4 Dec 2012 11:43:06 -0200 Subject: [PATCH 1/3] patch to support php::fpm version --- manifests/fpm/install.pp | 2 +- manifests/params.pp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/fpm/install.pp b/manifests/fpm/install.pp index a176245..7c6b2d6 100644 --- a/manifests/fpm/install.pp +++ b/manifests/fpm/install.pp @@ -1,6 +1,6 @@ class php::fpm::install { package { $php::params::fpm_package_name: - ensure => present, + ensure => $php::params::fpm_package_version, require => Class["php"], } } diff --git a/manifests/params.pp b/manifests/params.pp index 765b385..23408a0 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -11,6 +11,7 @@ $fpm_pool_dir = "${fpm_dir}pool.d/" $fpm_ini = "${fpm_dir}php.ini" $fpm_package_name = "php5-fpm" + $fpm_package_version = "present" $fpm_conf = "${fpm_dir}php-fpm.conf" $fpm_service_name = "php5-fpm" $apache_dir = "${base_dir}apache2/" From b173bb92bee3230c4233b3a53ea00a909c6fa9b3 Mon Sep 17 00:00:00 2001 From: Martin Loy Date: Tue, 4 Dec 2012 14:14:36 -0200 Subject: [PATCH 2/3] nuevo parameter linkeado a guruhub/puppet-php/#1 --- manifests/fpm.pp | 9 +++++++-- manifests/fpm/install.pp | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/manifests/fpm.pp b/manifests/fpm.pp index b2e8d9b..5589550 100644 --- a/manifests/fpm.pp +++ b/manifests/fpm.pp @@ -1,5 +1,10 @@ -class php::fpm($fpm_ini_content = undef, $fpm_ini_source = undef, $fpm_conf_content = undef, $fpm_conf_source = undef) { - include php, php::fpm::install, php::fpm::config, php::fpm::service +class php::fpm($fpm_ini_content = undef, $fpm_ini_source = undef, $fpm_conf_content = undef, $fpm_conf_source = undef, + $fpm_package_version = $php::params::fpm_package_version) { + include php, php::fpm::config, php::fpm::service + + class { 'php::fpm::install': + fpm_package_version => $fpm_package_version + } Class["php::config"] ~> Class["php::fpm::service"] } diff --git a/manifests/fpm/install.pp b/manifests/fpm/install.pp index 7c6b2d6..e61c061 100644 --- a/manifests/fpm/install.pp +++ b/manifests/fpm/install.pp @@ -1,6 +1,6 @@ -class php::fpm::install { +class php::fpm::install(fpm_package_version => $php::params::fpm_package_version, ) { package { $php::params::fpm_package_name: - ensure => $php::params::fpm_package_version, + ensure => $fpm_package_version, require => Class["php"], } } From 211fe7a3e1343dc958f630ac69d4d78994f97fee Mon Sep 17 00:00:00 2001 From: Martin Loy Date: Tue, 4 Dec 2012 14:22:10 -0200 Subject: [PATCH 3/3] probando nuevo parameter linkeado a guruhub/puppet-php/#1 --- manifests/fpm/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/fpm/install.pp b/manifests/fpm/install.pp index e61c061..194a638 100644 --- a/manifests/fpm/install.pp +++ b/manifests/fpm/install.pp @@ -1,4 +1,4 @@ -class php::fpm::install(fpm_package_version => $php::params::fpm_package_version, ) { +class php::fpm::install(fpm_package_version = $php::params::fpm_package_version, ) { package { $php::params::fpm_package_name: ensure => $fpm_package_version, require => Class["php"],