From 5ca21d8a1959fb2d8c3d212ab43344447693e2bc Mon Sep 17 00:00:00 2001
From: Etienne CHAMPETIER <champetier.etienne@gmail.com>
Date: Fri, 18 Mar 2016 13:33:04 +0100
Subject: [PATCH] Support - and _ in room name (update nginx conf exemples)

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
---
 doc/debian/jitsi-meet/jitsi-meet.example           | 4 ++--
 doc/example-config-files/jitsi.example.com.example | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/debian/jitsi-meet/jitsi-meet.example b/doc/debian/jitsi-meet/jitsi-meet.example
index f1b80095b..4abfdd6dd 100644
--- a/doc/debian/jitsi-meet/jitsi-meet.example
+++ b/doc/debian/jitsi-meet/jitsi-meet.example
@@ -25,7 +25,7 @@ server {
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
     }
 
-    location ~ ^/([a-zA-Z0-9]+)$ {
+    location ~ ^/([a-zA-Z0-9_-]+)$ {
         rewrite ^/(.*)$ / break;
     }
 
@@ -34,7 +34,7 @@ server {
     }
 
     # BOSH
-    location /http-bind {
+    location = /http-bind {
         proxy_pass      http://localhost:5280/http-bind;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $http_host;
diff --git a/doc/example-config-files/jitsi.example.com.example b/doc/example-config-files/jitsi.example.com.example
index a24fdaf50..cbc6c34d6 100755
--- a/doc/example-config-files/jitsi.example.com.example
+++ b/doc/example-config-files/jitsi.example.com.example
@@ -6,23 +6,23 @@ server {
     root /srv/jitsi.example.com;
     index index.html;
 
-    location ~ ^/([a-zA-Z0-9]+)$ {
+    location ~ ^/([a-zA-Z0-9_-]+)$ {
         rewrite ^/(.*)$ / break;
-        }
+    }
 
     location / {
         ssi on;
     }
 
     # BOSH
-    location /http-bind {
+    location = /http-bind {
         proxy_pass      http://localhost:5280/http-bind;
         proxy_set_header X-Forwarded-For $remote_addr;
         proxy_set_header Host $http_host;
     }
 
     # xmpp websockets
-    location /xmpp-websocket {
+    location = /xmpp-websocket {
         proxy_pass http://localhost:5280/xmpp-websocket;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;