File tree Expand file tree Collapse file tree 3 files changed +4
-21
lines changed Expand file tree Collapse file tree 3 files changed +4
-21
lines changed Original file line number Diff line number Diff line change 4
4
Class[' ::apache::mod::dav' ] -> Class[' ::apache::mod::dav_svn' ]
5
5
include ::apache
6
6
include ::apache::mod::dav
7
- if ( $::operatingsystem == ' SLES' and $::operatingsystemmajrelease < ' 12' ){
7
+ unless stdlib::os_version_gte( ' SLES' , ' 12' ) {
8
8
package { 'subversion-server' :
9
9
ensure => ' installed' ,
10
10
provider => ' zypper' ,
Original file line number Diff line number Diff line change 2
2
$options = {},
3
3
) {
4
4
include ::apache
5
- if ( $::osfamily == ' RedHat' and $::operatingsystemmajrelease == ' 7' ) or $::osfamily == ' FreeBSD' {
5
+ if stdlib::os_version_gte( ' RedHat' , ' 7' ) or $::osfamily == ' FreeBSD' {
6
6
$loadfile_name = ' unixd_fcgid.load'
7
7
$conf_name = ' unixd_fcgid.conf'
8
8
} else {
Original file line number Diff line number Diff line change @@ -125,25 +125,8 @@ class { 'apache::mod::passenger': }
125
125
126
126
describe file ( conf_file ) do
127
127
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/' }
147
130
end
148
131
# rubocop:enable RSpec/RepeatedExample
149
132
You can’t perform that action at this time.
0 commit comments