From 46574de24196a71bdcd83485d23beac105d40d9d Mon Sep 17 00:00:00 2001
From: Michael Moll <kvedulv@kvedulv.de>
Date: Fri, 2 Jan 2015 02:33:31 +0100
Subject: [PATCH] fix apache_version for Debian >7

---
 manifests/version.pp       | 2 +-
 spec/acceptance/version.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/manifests/version.pp b/manifests/version.pp
index f22797c4c..8304bb1a0 100644
--- a/manifests/version.pp
+++ b/manifests/version.pp
@@ -21,7 +21,7 @@
     'Debian': {
       if $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '13.10') >= 0 {
         $default = '2.4'
-      } elsif $::operatingsystem == 'Debian' and $::operatingsystemrelease == 'jessie/sid' {
+      } elsif $::operatingsystem == 'Debian' and versioncmp($distrelease, '8') >= 0 {
         $default = '2.4'
       } else {
         $default = '2.2'
diff --git a/spec/acceptance/version.rb b/spec/acceptance/version.rb
index b88412b42..c1578c52e 100644
--- a/spec/acceptance/version.rb
+++ b/spec/acceptance/version.rb
@@ -38,6 +38,8 @@
 
   if _operatingsystem == 'Ubuntu' and _operatingsystemrelease >= 13.10
     $apache_version = '2.4'
+  elsif _operatingsystem == 'Debian' and _operatingsystemrelease >= 8.0
+    $apache_version = '2.4'
   else
     $apache_version = '2.2'
   end