From c7817ae8009faa35b2884a2b87f127c9811690cb Mon Sep 17 00:00:00 2001 From: Federico Fapitalle Date: Thu, 13 Feb 2020 14:54:49 -0300 Subject: [PATCH] Optionally disables fpm config validation This adds the option to enable/disable fpm config file validation. --- manifests/fpm.pp | 1 + manifests/fpm/config.pp | 7 ++++++- manifests/fpm/pool.pp | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/manifests/fpm.pp b/manifests/fpm.pp index c8dd31e5..455d9fdb 100644 --- a/manifests/fpm.pp +++ b/manifests/fpm.pp @@ -69,6 +69,7 @@ $log_owner = $php::log_owner, $log_group = $php::log_group, Boolean $pool_purge = $php::pool_purge, + Boolean $disable_configtest = false, ) { if ! defined(Class['php']) { diff --git a/manifests/fpm/config.pp b/manifests/fpm/config.pp index f8c949ba..9a0edb4f 100644 --- a/manifests/fpm/config.pp +++ b/manifests/fpm/config.pp @@ -103,13 +103,18 @@ default => $log_group, } + $validate_cmd = $php::fpm::disable_configtest ? { + true => undef, + default => $php::globals::fpm_checkconf_cmd, + } + file { $config_file: ensure => file, content => template('php/fpm/php-fpm.conf.erb'), owner => root, group => $root_group, mode => '0644', - validate_cmd => $php::globals::fpm_checkconf_cmd, + validate_cmd => $validate_cmd, } ensure_resource('file', ['/var/run/php-fpm/', '/var/log/php-fpm/'], { diff --git a/manifests/fpm/pool.pp b/manifests/fpm/pool.pp index 179ddfd8..bfd94734 100644 --- a/manifests/fpm/pool.pp +++ b/manifests/fpm/pool.pp @@ -190,6 +190,11 @@ notify => Class['::php::fpm::service'], } } else { + $validate_cmd = $php::fpm::disable_configtest ? { + true => undef, + default => $php::globals::fpm_checkconf_cmd, + } + file { "${pool_base_dir}/${pool}.conf": ensure => file, notify => Class['::php::fpm::service'], @@ -198,7 +203,7 @@ owner => root, group => $root_group, mode => '0640', - validate_cmd => $php::globals::fpm_checkconf_cmd, + validate_cmd => $validate_cmd, } } }