Optionally disables fpm config validation

This adds the option to enable/disable fpm config file validation.
voxpupuli · Jun 19, 2020 · c7817ae · c7817ae
1 parent 2a6184c
commit c7817ae
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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,
     }
   }
 }