Merge pull request #975 from mmoll/jessie

fix apache_version for Debian >7
xbezdick · Jan 8, 2015 · e5d68eb · e5d68eb
2 parents 511287b + 46574de
commit e5d68eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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