From 97ca8107c0385d05a0de31e842e786231cb3e4f3 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Tue, 31 Jul 2012 19:42:31 +0300
Subject: [PATCH] Changed ejabberd rewrite proxy from /jabber/ to /bosh/

---
 ejabberd/files/ejabberd-httpd.conf | 2 +-
 ejabberd/files/htaccess            | 2 +-
 ejabberd/manifests/init.pp         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ejabberd/files/ejabberd-httpd.conf b/ejabberd/files/ejabberd-httpd.conf
index e238eff..7ac2a4c 100644
--- a/ejabberd/files/ejabberd-httpd.conf
+++ b/ejabberd/files/ejabberd-httpd.conf
@@ -1,3 +1,3 @@
-<Directory "/srv/www/https/*/jabber">
+<Directory "/srv/www/https/*/bosh">
   AllowOverride All
 </Directory>
diff --git a/ejabberd/files/htaccess b/ejabberd/files/htaccess
index 5239a6c..c6801cf 100644
--- a/ejabberd/files/htaccess
+++ b/ejabberd/files/htaccess
@@ -1,4 +1,4 @@
 <IfModule mod_rewrite.c>
   RewriteEngine On
-  RewriteRule ^(.*)$ http://localhost:5280/$1 [P]
+  RewriteRule ^(.*)$ http://localhost:5280/http-bind/$1 [P,L]
 </IfModule>
diff --git a/ejabberd/manifests/init.pp b/ejabberd/manifests/init.pp
index a9abaeb..7df3d82 100644
--- a/ejabberd/manifests/init.pp
+++ b/ejabberd/manifests/init.pp
@@ -151,7 +151,7 @@ class ejabberd {
     $htdocs = "/usr/share/ejabberd/htdocs"
 
     define configwebhost() {
-        file { "/srv/www/https/${name}/jabber":
+        file { "/srv/www/https/${name}/bosh":
             ensure  => link,
             target  => $htdocs,
             require => File["/srv/www/https/${name}"],