Merge pull request #1557 from eputnam/MODULES-3972

(MODULES-3972) fixes version errors and small fix for suse ssl

Author: DavidS

spec/acceptance/vhost_spec.rb

@@ -8,10 +8,12 @@
         class { 'apache':
           default_vhost => false,
           default_ssl_vhost => false,
-          service_ensure => stopped
+          service_ensure => stopped,
         }
         if ($::osfamily == 'Suse') {
-          exec { '/usr/bin/gensslcert': }
+          exec { '/usr/bin/gensslcert':
+            require => Class['apache'],
+          }
          }
       EOS
 
@@ -312,7 +314,7 @@ class { 'apache':
         pp = <<-EOS
           class { 'apache': }
 
-          if versioncmp($apache::apache_version, '2.4') >= 0 {
+          if versioncmp($apache_version, '2.4') >= 0 {
             $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'require' => 'all denied', }
           } else {
             $_files_match_directory = { 'path' => '(\.swp|\.bak|~)$', 'provider' => 'filesmatch', 'deny' => 'from all', }
@@ -360,7 +362,7 @@ class { 'apache': }
         pp = <<-EOS
           class { 'apache': }
 
-          if versioncmp($apache::apache_version, '2.4') >= 0 {
+          if versioncmp($apache_version, '2.4') >= 0 {
             $_files_match_directory = { 'path' => 'private.html$', 'provider' => 'filesmatch', 'require' => 'all denied' }
           } else {
             $_files_match_directory = [