Merge pull request #903 from mhaskel/ubuntu_1004_dav_svn

Update loadfile name for Ubuntu 10.04
redhat-openstack · Oct 20, 2014 · 3d8f21a · 3d8f21a
2 parents 0dd65e8 + be3e526
commit 3d8f21a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/manifests/mod/dav_svn.pp b/manifests/mod/dav_svn.pp
@@ -5,7 +5,7 @@
   include ::apache::mod::dav
   ::apache::mod { 'dav_svn': }
 
-  if $::osfamily == 'Debian' and $::operatingsystemmajrelease != '6' {
+  if $::osfamily == 'Debian' and ($::operatingsystemmajrelease != '6' and $::operatingsystemmajrelease != '10.04') {
     $loadfile_name = undef
   } else {
     $loadfile_name = 'dav_svn_authz_svn.load'

diff --git a/spec/acceptance/mod_dav_svn_spec.rb b/spec/acceptance/mod_dav_svn_spec.rb
@@ -5,7 +5,7 @@
   when 'Debian'
     mod_dir             = '/etc/apache2/mods-available'
     service_name        = 'apache2'
-    if fact('operatingsystemmajrelease') == '6'
+    if fact('operatingsystemmajrelease') == '6' or fact('operatingsystemmajrelease') == '10.04'
       authz_svn_load_file = 'dav_svn_authz_svn.load'
     else
       authz_svn_load_file = 'authz_svn.load'