diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2018-04-12 12:54:20 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2018-04-12 12:54:20 -0300 |
| commit | 5463cc3ce5ad481b6f72cebd20c40af8017848c1 (patch) | |
| tree | 5e12278da77d0f144ff73384c767d64ec1b20088 | |
| parent | d6c4448ef33d3ab3fdc3cbf9b5eaaae2a8592195 (diff) | |
| download | puppet-php-5463cc3ce5ad481b6f72cebd20c40af8017848c1.tar.gz puppet-php-5463cc3ce5ad481b6f72cebd20c40af8017848c1.tar.bz2 | |
Fix php-fpm service requirements
| -rw-r--r-- | manifests/config.pp | 7 | ||||
| -rw-r--r-- | manifests/fpm/pool.pp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/manifests/config.pp b/manifests/config.pp index 93c0e5b..ca307e3 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -1,9 +1,11 @@ define php::config($series = '5', $order = '20', $value, $ensure = 'present', $sapi = 'apache2') { if $series == '5' { - $folder = $::php::series5::folder + $version = $::php::series5::version + $folder = $::php::series5::folder } else { - $folder = $::php::series7::folder + $version = $::php::series7::version + $folder = $::php::series7::folder } file { "${folder}/${sapi}/conf.d/${order}-${name}.ini": @@ -15,6 +17,7 @@ define php::config($series = '5', $order = '20', $value, $ensure = 'present', $s require => File["${folder}/${sapi}/conf.d"], notify => $sapi ? { 'apache2' => Service['apache2'], + 'fpm' => Service["php${version}-fpm"], default => undef, }, } diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp index 75560db..d587dff 100644 --- a/manifests/fpm/pool.pp +++ b/manifests/fpm/pool.pp @@ -17,6 +17,6 @@ define php::fpm::pool( ensure => $ensure, source => $source, require => Package['php-fpm'], - notify => Service["php-${version}-fpm"], + notify => Service["php${version}-fpm"], } } |