Merge pull request voxpupuli#1352 from anarcat/debian-run-dir

Debian run_dir should be in /var/run/nginx
Rubueno · Oct 31, 2019 · b65756f · b65756f
2 parents 60fa1f8 + 26aedaa
commit b65756f
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 20 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -115,13 +115,15 @@
           'log_user'    => 'root',
           'log_group'   => 'adm',
           'log_mode'    => '0755',
+          'run_dir'     => '/run/nginx',
         }
       } else {
         $_module_os_overrides = {
           'daemon_user' => 'www-data',
           'log_user'    => 'root',
           'log_group'   => 'adm',
           'log_mode'    => '0755',
+          'run_dir'     => '/run/nginx',
         }
       }
     }

diff --git a/spec/classes/nginx_spec.rb b/spec/classes/nginx_spec.rb
@@ -299,26 +299,54 @@
             )
           end
           it do
-            is_expected.to contain_file('/var/nginx').with(
-              ensure: 'directory',
-              owner: 'root',
-              group: 'root',
-              mode: '0644'
-            )
+            case facts[:osfamily]
+            when 'Debian'
+              is_expected.to contain_file('/run/nginx').with(
+                ensure: 'directory',
+                owner: 'root',
+                group: 'root',
+                mode: '0644'
+              )
+            else
+              is_expected.to contain_file('/var/nginx').with(
+                ensure: 'directory',
+                owner: 'root',
+                group: 'root',
+                mode: '0644'
+              )
+            end
           end
           it do
-            is_expected.to contain_file('/var/nginx/client_body_temp').with(
-              ensure: 'directory',
-              group: 'root',
-              mode: '0644'
-            )
+            case facts[:osfamily]
+            when 'Debian'
+              is_expected.to contain_file('/run/nginx/client_body_temp').with(
+                ensure: 'directory',
+                group: 'root',
+                mode: '0644'
+              )
+            else
+              is_expected.to contain_file('/var/nginx/client_body_temp').with(
+                ensure: 'directory',
+                group: 'root',
+                mode: '0644'
+              )
+            end
           end
           it do
-            is_expected.to contain_file('/var/nginx/proxy_temp').with(
-              ensure: 'directory',
-              group: 'root',
-              mode: '0644'
-            )
+            case facts[:osfamily]
+            when 'Debian'
+              is_expected.to contain_file('/run/nginx/proxy_temp').with(
+                ensure: 'directory',
+                group: 'root',
+                mode: '0644'
+              )
+            else
+              is_expected.to contain_file('/var/nginx/proxy_temp').with(
+                ensure: 'directory',
+                group: 'root',
+                mode: '0644'
+              )
+            end
           end
           it do
             is_expected.to contain_file('/etc/nginx/nginx.conf').with(
@@ -364,8 +392,8 @@
               )
             end
           when 'Debian'
-            it { is_expected.to contain_file('/var/nginx/client_body_temp').with(owner: 'www-data') }
-            it { is_expected.to contain_file('/var/nginx/proxy_temp').with(owner: 'www-data') }
+            it { is_expected.to contain_file('/run/nginx/client_body_temp').with(owner: 'www-data') }
+            it { is_expected.to contain_file('/run/nginx/proxy_temp').with(owner: 'www-data') }
             it { is_expected.to contain_file('/etc/nginx/nginx.conf').with_content %r{^user www-data;} }
             it do
               is_expected.to contain_file('/var/log/nginx').with(
@@ -1146,8 +1174,14 @@
           context 'when daemon_user = www-data' do
             let(:params) { { daemon_user: 'www-data' } }
 
-            it { is_expected.to contain_file('/var/nginx/client_body_temp').with(owner: 'www-data') }
-            it { is_expected.to contain_file('/var/nginx/proxy_temp').with(owner: 'www-data') }
+            case facts[:osfamily]
+            when 'Debian'
+              it { is_expected.to contain_file('/run/nginx/client_body_temp').with(owner: 'www-data') }
+              it { is_expected.to contain_file('/run/nginx/proxy_temp').with(owner: 'www-data') }
+            else
+              it { is_expected.to contain_file('/var/nginx/client_body_temp').with(owner: 'www-data') }
+              it { is_expected.to contain_file('/var/nginx/proxy_temp').with(owner: 'www-data') }
+            end
             it { is_expected.to contain_file('/etc/nginx/nginx.conf').with_content %r{^user www-data;} }
           end