Skip to content

Commit 183489e

Browse files
committed
Always apply dav_svn/authz_svn work-around
The work-around that distros apply for dav_svn/authz_svn module loading issue is overwritten by this module. Always apply the work-around.
1 parent 8a67aa4 commit 183489e

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

manifests/mod/dav_svn.pp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,11 @@
2121

2222
::apache::mod { 'dav_svn': }
2323

24-
if $::osfamily == 'Debian' and ! ($::operatingsystemmajrelease in ['6', '9', '16.04', '18.04']) {
25-
$loadfile_name = undef
26-
} else {
27-
$loadfile_name = 'dav_svn_authz_svn.load'
28-
}
29-
3024
if $authz_svn_enabled {
3125
::apache::mod { 'authz_svn':
32-
loadfile_name => $loadfile_name,
26+
# authz_svn depends on symbols from the dav_svn module,
27+
# therefore, make sure authz_svn is loaded after dav_svn.
28+
loadfile_name => 'dav_svn_authz_svn.load',
3329
require => Apache::Mod['dav_svn'],
3430
}
3531
}

spec/classes/mod/dav_svn_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
it { is_expected.to contain_apache__mod('dav_svn') }
2525
it { is_expected.to contain_package('libapache2-svn') }
2626
it { is_expected.to contain_apache__mod('authz_svn') }
27-
it { is_expected.to contain_file('authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
27+
it { is_expected.to contain_file('dav_svn_authz_svn.load').with_content(%r{LoadModule authz_svn_module}) }
2828
end
2929
end
3030
context 'on a RedHat OS' do

0 commit comments

Comments
 (0)