ejabberd: Disable DirectoryIndex in bosh path for Apache 2.4

See https://bz.apache.org/bugzilla/show_bug.cgi?id=53929
This commit is contained in:
Ossi Salmi 2015-06-08 13:06:43 +03:00
parent dc87bed659
commit 29b570ca6b
2 changed files with 6 additions and 5 deletions

View file

@ -251,8 +251,7 @@ class ejabberd(
mode => "0644", mode => "0644",
owner => "root", owner => "root",
group => "root", group => "root",
source => "puppet:///modules/ejabberd/htaccess", content => template("ejabberd/htaccess.erb"),
require => File[$htdocs],
} }
apache::configfile { "ejabberd.conf": apache::configfile { "ejabberd.conf":
@ -278,9 +277,8 @@ class ejabberd(
define ejabberd::configwebhost($htdocs) { define ejabberd::configwebhost($htdocs) {
file { "/srv/www/https/${name}/bosh": file { "/srv/www/https/${name}/bosh":
ensure => link, ensure => link,
target => $htdocs, target => $htdocs,
require => File["/srv/www/https/${name}"],
} }
} }

View file

@ -1,3 +1,6 @@
<% if scope.lookupvar('apache::version') == '2.4' -%>
DirectoryIndex disabled
<% end -%>
<IfModule mod_rewrite.c> <IfModule mod_rewrite.c>
RewriteEngine On RewriteEngine On
RewriteRule ^(.*)$ http://localhost:5280/http-bind/$1 [P,L] RewriteRule ^(.*)$ http://localhost:5280/http-bind/$1 [P,L]