Skip to content

Commit 46574de

Browse files
committed
fix apache_version for Debian >7
1 parent 10f04ef commit 46574de

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

manifests/version.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
'Debian': {
2222
if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0 {
2323
$default = '2.4'
24-
} elsif $::operatingsystem == 'Debian' and $::operatingsystemrelease == 'jessie/sid' {
24+
} elsif $::operatingsystem == 'Debian' and versioncmp($distrelease, '8') >= 0 {
2525
$default = '2.4'
2626
} else {
2727
$default = '2.2'

spec/acceptance/version.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838

3939
if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10
4040
$apache_version = '2.4'
41+
elsif _operatingsystem == 'Debian' and _operatingsystemrelease >= 8.0
42+
$apache_version = '2.4'
4143
else
4244
$apache_version = '2.2'
4345
end

0 commit comments

Comments
 (0)