Skip to content

Commit 75f0bc6

Browse files
committed
os_version_gte implemented
1 parent f9f0773 commit 75f0bc6

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

manifests/mod/dav_svn.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Class['::apache::mod::dav'] -> Class['::apache::mod::dav_svn']
55
include ::apache
66
include ::apache::mod::dav
7-
if($::operatingsystem == 'SLES' and $::operatingsystemmajrelease < '12'){
7+
unless stdlib::os_version_gte('SLES', '12') {
88
package { 'subversion-server':
99
ensure => 'installed',
1010
provider => 'zypper',

manifests/mod/fcgid.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
$options = {},
33
) {
44
include ::apache
5-
if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7') or $::osfamily == 'FreeBSD' {
5+
if stdlib::os_version_gte('RedHat', '7') or $::osfamily == 'FreeBSD' {
66
$loadfile_name = 'unixd_fcgid.load'
77
$conf_name = 'unixd_fcgid.conf'
88
} else {

spec/acceptance/mod_passenger_spec.rb

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -125,25 +125,8 @@ class { 'apache::mod::passenger': }
125125

126126
describe file(conf_file) do
127127
it { is_expected.to contain %(PassengerRoot "#{passenger_root}") }
128-
case fact('operatingsystem')
129-
when 'Ubuntu'
130-
it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
131-
it { is_expected.not_to contain '/PassengerRuby/' }
132-
when 'Debian'
133-
case fact('operatingsystemmajrelease')
134-
when '8'
135-
it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
136-
it { is_expected.not_to contain '/PassengerRuby/' }
137-
when '9'
138-
it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
139-
it { is_expected.not_to contain '/PassengerRuby/' }
140-
else
141-
# Includes wheezy
142-
# This may or may not work on Debian releases other than the above
143-
it { is_expected.to contain %(PassengerRuby "#{passenger_ruby}) }
144-
it { is_expected.not_to contain '/PassengerDefaultRuby/' }
145-
end
146-
end
128+
it { is_expected.to contain %(PassengerDefaultRuby "#{passenger_default_ruby}") }
129+
it { is_expected.not_to contain '/PassengerRuby/' }
147130
end
148131
# rubocop:enable RSpec/RepeatedExample
149132

0 commit comments

Comments
 (0)