Skip to content
This repository was archived by the owner on Apr 24, 2024. It is now read-only.
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
4 changes: 2 additions & 2 deletions manifests/apache2/install.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class php::apache2::install {
class php::apache2::install ($version = 'present') {
package { $php::params::apache_package_name:
ensure => present,
ensure => $version,
notify => Service[$php::params::apache_service_name],
}
}
15 changes: 10 additions & 5 deletions manifests/fpm.pp
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
class php::fpm (
$fpm_ini_content = undef,
$fpm_ini_source = undef,
$version = present,
$fpm_ini_content = undef,
$fpm_ini_source = undef,
$fpm_conf_content = undef,
$fpm_conf_source = undef
$fpm_conf_source = undef
) {
include php
include php::fpm::install
class { 'php':
version => $version
}
class { 'php::fpm::install':
version => $version
}
include php::fpm::config
include php::fpm::service

Expand Down
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 ($version = 'present') {
package { $php::params::fpm_package_name:
ensure => present,
ensure => $version,
require => Class['php'],
}
}
9 changes: 7 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
class php(
class php (
$version = 'present',
$cli_ini_content = undef,
$cli_ini_source = undef
) {
include php::params, php::install, php::config
class { 'php::params': }
class { 'php::install':
version => $version
}
class { 'php::config': }
}
4 changes: 2 additions & 2 deletions manifests/install.pp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class php::install {
class php::install ($version = 'present') {
package { $php::params::cli_package_name:
ensure => present,
ensure => $version,
}
}
6 changes: 3 additions & 3 deletions manifests/module.pp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define php::module(
$ensure = present,
$version = present,
$package_prefix = 'php5-',
$source = undef,
$content = undef,
Expand All @@ -20,7 +20,7 @@
}

package { "php-${name}":
ensure => $ensure,
ensure => $version,
name => "${package_prefix}${name}",
require => $real_require,
}
Expand All @@ -42,7 +42,7 @@
}

file { $file_name:
ensure => $ensure,
ensure => present,
path => "${php::params::conf_dir}${file_name}",
mode => '0644',
owner => 'root',
Expand Down