Merge pull request #672 from maestrodev/ubuntu-bad-version

Apache version in Ubuntu 13.10 is 2.4

manifests/version.pp

@@ -19,7 +19,7 @@
       }
     }
     'Debian': {
-      if $::operatingsystem == 'Ubuntu' and $distrelease >= 13.10 {
+      if $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease >= 13.10 {
         $default = 2.4
       } else {
         $default = 2.2

spec/acceptance/vhost_spec.rb

@@ -688,10 +688,11 @@ class { 'apache': service_ensure => stopped, }
         class { 'apache': }
         host { 'test.server': ip => '127.0.0.1' }
         apache::vhost { 'test.server':
-          docroot          => '/tmp',
-	  action => 'php-fastcgi',
+          docroot => '/tmp',
+          action  => 'php-fastcgi',
         }
       EOS
+      pp = pp + "\nclass { 'apache::mod::actions': }" if fact('osfamily') == 'Debian'
       apply_manifest(pp, :catch_failures => true)
     end
 

spec/classes/apache_spec.rb

@@ -140,6 +140,39 @@
         it { should contain_file("/etc/apache2/apache2.conf").with_content %r{^Group www-data\n} }
       end
     end
+
+    context "on Ubuntu" do
+      let :facts do
+        super().merge({
+          :operatingsystem => 'Ubuntu'
+        })
+      end
+
+      context "13.10" do
+        let :facts do
+          super().merge({
+            :operatingsystemrelease => '13.10'
+          })
+        end
+        it { should contain_class('apache').with_apache_version('2.4') }
+      end
+      context "12.04" do
+        let :facts do
+          super().merge({
+            :operatingsystemrelease => '12.04'
+          })
+        end
+        it { should contain_class('apache').with_apache_version('2.2') }
+      end
+      context "13.04" do
+        let :facts do
+          super().merge({
+            :operatingsystemrelease => '13.04'
+          })
+        end
+        it { should contain_class('apache').with_apache_version('2.2') }
+      end
+    end
   end
   context "on a RedHat 5 OS" do
     let :facts do