From 2a6184c34ecab60ece2ed49478c9b0b13615e996 Mon Sep 17 00:00:00 2001
From: Federico Fapitalle <federico.fapitalle@avature.net>
Date: Wed, 12 Feb 2020 17:33:49 -0300
Subject: [PATCH] Adds config file validation for fpm service

Defines validation command for fpm service configuration files, and
sets it as a requirement.
---
 manifests/fpm/config.pp | 11 ++++++-----
 manifests/fpm/pool.pp   | 15 ++++++++-------
 manifests/globals.pp    |  5 +++++
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/manifests/fpm/config.pp b/manifests/fpm/config.pp
index c255a853..f8c949ba 100644
--- a/manifests/fpm/config.pp
+++ b/manifests/fpm/config.pp
@@ -104,11 +104,12 @@
   }
 
   file { $config_file:
-    ensure  => file,
-    content => template('php/fpm/php-fpm.conf.erb'),
-    owner   => root,
-    group   => $root_group,
-    mode    => '0644',
+    ensure       => file,
+    content      => template('php/fpm/php-fpm.conf.erb'),
+    owner        => root,
+    group        => $root_group,
+    mode         => '0644',
+    validate_cmd => $php::globals::fpm_checkconf_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 e7dcb213..179ddfd8 100644
--- a/manifests/fpm/pool.pp
+++ b/manifests/fpm/pool.pp
@@ -191,13 +191,14 @@
     }
   } else {
     file { "${pool_base_dir}/${pool}.conf":
-      ensure  => file,
-      notify  => Class['::php::fpm::service'],
-      require => Package[$real_package],
-      content => template($template),
-      owner   => root,
-      group   => $root_group,
-      mode    => '0640',
+      ensure       => file,
+      notify       => Class['::php::fpm::service'],
+      require      => Package[$real_package],
+      content      => template($template),
+      owner        => root,
+      group        => $root_group,
+      mode         => '0640',
+      validate_cmd => $php::globals::fpm_checkconf_cmd,
     }
   }
 }
diff --git a/manifests/globals.pp b/manifests/globals.pp
index 8a800548..54b21eb5 100644
--- a/manifests/globals.pp
+++ b/manifests/globals.pp
@@ -51,6 +51,7 @@
             $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid"
             $fpm_error_log = '/var/log/php5-fpm.log'
             $fpm_service_name = 'php5-fpm'
+            $fpm_checkconf_cmd = '/usr/sbin/php5-fpm -t --fpm-config %'
             $ext_tool_enable = '/usr/sbin/php5enmod'
             $ext_tool_query = '/usr/sbin/php5query'
             $package_prefix = 'php5-'
@@ -60,6 +61,7 @@
             $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid"
             $fpm_error_log = "/var/log/php${globals_php_version}-fpm.log"
             $fpm_service_name = "php${globals_php_version}-fpm"
+            $fpm_checkconf_cmd = "/usr/sbin/php-fpm${globals_php_version} -t --fpm-config %"
             $ext_tool_enable = "/usr/sbin/phpenmod -v ${globals_php_version}"
             $ext_tool_query = "/usr/sbin/phpquery -v ${globals_php_version}"
             $package_prefix = "php${globals_php_version}-"
@@ -71,6 +73,7 @@
             $default_fpm_pid_file = '/var/run/php5-fpm.pid'
             $fpm_error_log = '/var/log/php5-fpm.log'
             $fpm_service_name = 'php5-fpm'
+            $fpm_checkconf_cmd = '/usr/sbin/php5-fpm -t --fpm-config %'
             $ext_tool_enable = '/usr/sbin/php5enmod'
             $ext_tool_query = '/usr/sbin/php5query'
             $package_prefix = 'php5-'
@@ -84,6 +87,7 @@
             $default_fpm_pid_file = "/var/run/php/php${globals_php_version}-fpm.pid"
             $fpm_error_log        = "/var/log/php${globals_php_version}-fpm.log"
             $fpm_service_name     = "php${globals_php_version}-fpm"
+            $fpm_checkconf_cmd    = "/usr/sbin/php-fpm${globals_php_version} -t --fpm-config %"
             $ext_tool_enable      = "/usr/sbin/phpenmod -v ${globals_php_version}"
             $ext_tool_query       = "/usr/sbin/phpquery -v ${globals_php_version}"
             $package_prefix       = "php${globals_php_version}-"
@@ -93,6 +97,7 @@
             $default_fpm_pid_file = '/var/run/php5-fpm.pid'
             $fpm_error_log = '/var/log/php5-fpm.log'
             $fpm_service_name = 'php5-fpm'
+            $fpm_checkconf_cmd = '/usr/sbin/php5-fpm -t --fpm-config %'
             $ext_tool_enable = '/usr/sbin/php5enmod'
             $ext_tool_query = '/usr/sbin/php5query'
             $package_prefix = 'php5-'