From 2b985c3543c440a16f6b8cb8890c858597f8fa64 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 26 Aug 2013 10:23:30 -0300
Subject: [PATCH] Updating settings

---
 src/colab/custom_settings.py | 10 ++++++++--
 src/colab/urls.py            |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 3b0093d..6ee2755 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -22,6 +22,7 @@ INSTALLED_APPS = INSTALLED_APPS + (
     'south',
     'cliauth',
     'django_browserid',
+    'conversejs',
 
     # Own apps
     'super_archives',
@@ -30,7 +31,6 @@ INSTALLED_APPS = INSTALLED_APPS + (
     'colab.deprecated',
     'planet',
     'accounts',
-    'conversejs',
 
     # Feedzilla and deps
     'feedzilla',
@@ -97,7 +97,11 @@ LOGGING = {
         'django_browserid': {
             'handlers': ['sentry', 'console'],
             'level': 'DEBUG',
-        }
+        },
+        'boshclient': {
+            'handlers': ['console'],
+            'level': 'DEBUG',
+        },
     }
 }
 
@@ -173,6 +177,8 @@ SOLR_BASE_QUERY = """
 
 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/'
 
+CONVERSEJS_BOSH_SERVICE_URL = 'https://bind.opkode.im'
+
 REVPROXY_ADD_REMOTE_USER = True
 
 try:
diff --git a/src/colab/urls.py b/src/colab/urls.py
index d19fb2a..0cdba3e 100644
--- a/src/colab/urls.py
+++ b/src/colab/urls.py
@@ -27,7 +27,7 @@ urlpatterns = patterns('',
 
     url(r'^planet/', include('feedzilla.urls')),
 
-    (r'^browserid/', include('django_browserid.urls')),
+    url(r'^browserid/', include('django_browserid.urls')),
 
     # Uncomment the next line to enable the admin:
     url(r'^colab/admin/', include(admin.site.urls)),
--
libgit2 0.21.2