Skip to content

Commit 4bb9169

Browse files
committed
Fix support for Fedora Rawhide
1 parent fee6749 commit 4bb9169

File tree

2 files changed

+37
-1
lines changed

2 files changed

+37
-1
lines changed

manifests/version.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
case $::osfamily {
1414
'RedHat': {
15-
if ($::operatingsystem == 'Fedora' and $distrelease >= 18) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
15+
if ($::operatingsystem == 'Fedora' and versioncmp($distrelease, '18') >= 0) or ($::operatingsystem != 'Fedora' and $distrelease >= 7) {
1616
$default = '2.4'
1717
} else {
1818
$default = '2.2'

spec/classes/apache_spec.rb

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,6 +488,42 @@
488488
it { is_expected.to contain_file("/etc/httpd/conf/httpd.conf").with_content %r{^EnableSendfile Off\n} }
489489
end
490490
end
491+
context "on Fedora" do
492+
let :facts do
493+
super().merge({
494+
:operatingsystem => 'Fedora'
495+
})
496+
end
497+
498+
context "21" do
499+
let :facts do
500+
super().merge({
501+
:lsbdistrelease => '21',
502+
:operatingsystemrelease => '21'
503+
})
504+
end
505+
it { is_expected.to contain_class('apache').with_apache_version('2.4') }
506+
end
507+
context "Rawhide" do
508+
let :facts do
509+
super().merge({
510+
:lsbdistrelease => 'Rawhide',
511+
:operatingsystemrelease => 'Rawhide'
512+
})
513+
end
514+
it { is_expected.to contain_class('apache').with_apache_version('2.4') }
515+
end
516+
# kinda obsolete
517+
context "17" do
518+
let :facts do
519+
super().merge({
520+
:lsbdistrelease => '17',
521+
:operatingsystemrelease => '17'
522+
})
523+
end
524+
it { is_expected.to contain_class('apache').with_apache_version('2.2') }
525+
end
526+
end
491527
end
492528
context "on a FreeBSD OS" do
493529
let :facts do

0 commit comments

Comments
 (0)