Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions manifests/fpm.pp
Original file line number Diff line number Diff line change
@@ -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"]
}
4 changes: 2 additions & 2 deletions manifests/fpm/install.pp
Original file line number Diff line number Diff line change
@@ -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 => present,
ensure => $fpm_package_version,
require => Class["php"],
}
}
1 change: 1 addition & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down