Merge 45939ed into baec950

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,

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.not_to contain_file('/var/run/php-fpm/') }
+      end
     end
   end
 end