Merge pull request #2258 from puppetlabs/define_vhost_spec

chelnak · web-flow · commit 8854fbb79e4e · 2022-06-30T11:11:52.000+01:00
(maint) Fix compare in defines/vhost_spec.rb
diff --git a/spec/defines/vhost_spec.rb b/spec/defines/vhost_spec.rb
@@ -1762,7 +1762,7 @@
           end
 
           # this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu
-          unless facts[:os]['family'] || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
+          unless facts[:os]['family'] == 'Debian' || (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)
             describe 'fastcgi options' do
               let :params do
                 {

Original file line number	Diff line number	Diff line change
`@@ -1762,7 +1762,7 @@`
`1762`	`1762`	`end`
`1763`	`1763`
`1764`	`1764`	`# this setup uses fastcgi wich isn't available on RHEL 7 / RHEL 8 / Debian / Ubuntu`
`1765`		`- unless facts[:os]['family'] \|\| (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)`
	`1765`	`+ unless facts[:os]['family'] == 'Debian' \|\| (facts[:os]['family'] == 'RedHat' && facts[:os]['release']['major'].to_i >= 7)`
`1766`	`1766`	`describe 'fastcgi options' do`
`1767`	`1767`	`let :params do`
`1768`	`1768`	`{`