From 29b570ca6b6d50be12ff4727b75e7e1e296f0a73 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Mon, 8 Jun 2015 13:06:43 +0300
Subject: [PATCH] ejabberd: Disable DirectoryIndex in bosh path for Apache 2.4

See https://bz.apache.org/bugzilla/show_bug.cgi?id=53929
---
 ejabberd/manifests/init.pp                          | 8 +++-----
 ejabberd/{files/htaccess => templates/htaccess.erb} | 3 +++
 2 files changed, 6 insertions(+), 5 deletions(-)
 rename ejabberd/{files/htaccess => templates/htaccess.erb} (57%)

diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp
index 7c5a2c2..a8f185b 100644
--- a/ejabberd/manifests/init.pp
+++ b/ejabberd/manifests/init.pp
@@ -251,8 +251,7 @@ class ejabberd(
             mode    => "0644",
             owner   => "root",
             group   => "root",
-            source  => "puppet:///modules/ejabberd/htaccess",
-            require => File[$htdocs],
+            content => template("ejabberd/htaccess.erb"),
         }
 
         apache::configfile { "ejabberd.conf":
@@ -278,9 +277,8 @@ class ejabberd(
 define ejabberd::configwebhost($htdocs) {
 
     file { "/srv/www/https/${name}/bosh":
-        ensure  => link,
-        target  => $htdocs,
-        require => File["/srv/www/https/${name}"],
+        ensure => link,
+        target => $htdocs,
     }
 
 }
diff --git a/ejabberd/files/htaccess b/ejabberd/templates/htaccess.erb
similarity index 57%
rename from ejabberd/files/htaccess
rename to ejabberd/templates/htaccess.erb
index c6801cf..5cff781 100644
--- a/ejabberd/files/htaccess
+++ b/ejabberd/templates/htaccess.erb
@@ -1,3 +1,6 @@
+<% if scope.lookupvar('apache::version') == '2.4' -%>
+DirectoryIndex disabled
+<% end -%>
 <IfModule mod_rewrite.c>
   RewriteEngine On
   RewriteRule ^(.*)$ http://localhost:5280/http-bind/$1 [P,L]