From f8d788adf5f181ed2cdab1b9011a852ef5454849 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Tue, 27 Aug 2013 18:48:39 -0300
Subject: [PATCH] Updating settings

---
 src/colab/custom_settings.py    | 7 ++++---
 src/colab/local_settings-dev.py | 5 +++++
 src/colab/urls.py               | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 6ee2755..2b84698 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -156,7 +156,7 @@ FEEDZILLA_SITE_DESCRIPTION = gettext(u'Colab blog aggregator')
 
 
 ### BrowserID / Persona
-SITE_URL = 'http://colab.interlegis.leg.br'
+SITE_URL = 'https://colab.interlegis.leg.br'
 
 LOGIN_REDIRECT_URL = '/'
 LOGIN_REDIRECT_URL_FAILURE = '/'
@@ -177,10 +177,11 @@ 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
 
+# This URL must use SSL in order to keep chat sessions secure
+CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
+
 try:
     from local_settings import *
 except ImportError:
diff --git a/src/colab/local_settings-dev.py b/src/colab/local_settings-dev.py
index ce2fd5b..e6471ea 100644
--- a/src/colab/local_settings-dev.py
+++ b/src/colab/local_settings-dev.py
@@ -21,3 +21,8 @@ SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'
 #SOCKS_PORT = 9050
 
 SITE_URL = 'http://localhost:8000'
+
+INTERNAL_IPS = ('127.0.0.1', )
+
+CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
+
diff --git a/src/colab/urls.py b/src/colab/urls.py
index 0cdba3e..479306d 100644
--- a/src/colab/urls.py
+++ b/src/colab/urls.py
@@ -34,5 +34,5 @@ urlpatterns = patterns('',
 
     # Trac URLs
     url(u'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment).*)$',
-        'revproxy.views.proxy', {'base_url': settings.COLAB_TRAC_URL})
+        'revproxy.views.proxy', {'base_url': settings.COLAB_TRAC_URL}),
 )
--
libgit2 0.21.2