From 3cc1c93d848e34b17e0442b78c26df9672be6b5b Mon Sep 17 00:00:00 2001
From: Stephan Eicher <stephan.eicher@check24.de>
Date: Sat, 17 Aug 2019 22:10:06 +0200
Subject: [PATCH] Prevent creation of pid file directory if not used

---
 manifests/fpm/config.pp             | 10 +++++++++-
 spec/classes/php_fpm_config_spec.rb | 20 ++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/manifests/fpm/config.pp b/manifests/fpm/config.pp
index c255a853..350226a3 100644
--- a/manifests/fpm/config.pp
+++ b/manifests/fpm/config.pp
@@ -111,7 +111,15 @@
     mode    => '0644',
   }
 
-  ensure_resource('file', ['/var/run/php-fpm/', '/var/log/php-fpm/'], {
+  if (dirname($pid_file) == '/var/run/php-fpm') {
+    ensure_resource('file', ['/var/run/php-fpm/'], {
+      ensure => directory,
+      owner => $user,
+      group => $group,
+    })
+  }
+
+  ensure_resource('file', ['/var/log/php-fpm/'], {
     ensure => directory,
     owner => $user,
     group => $group,
diff --git a/spec/classes/php_fpm_config_spec.rb b/spec/classes/php_fpm_config_spec.rb
index 3e6d4c91..40049484 100644
--- a/spec/classes/php_fpm_config_spec.rb
+++ b/spec/classes/php_fpm_config_spec.rb
@@ -36,6 +36,26 @@
           )
         end
       end
+
+      describe 'creates default pid directory' do
+        let(:params) do
+          {
+            pid_file: '/var/run/php-fpm/php-fpm.pid'
+          }
+        end
+
+        it { is_expected.to contain_file('/var/run/php-fpm/') }
+      end
+
+      describe 'not creates default pid directory with custom pid file path' do
+        let(:params) do
+          {
+            pid_file: '/var/run/php-fpm.pid'
+          }
+        end
+
+        it { is_expected.to_not contain_file('/var/run/php-fpm/') }
+      end
     end
   end
 end