From 513882690f4e50aae71e23e111d147c38674f6f0 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Fri, 18 Oct 2013 09:24:22 -0300
Subject: [PATCH] Updating settings

---
 src/colab/custom_settings.py    | 19 ++++++++-----------
 src/colab/local_settings-dev.py |  2 ++
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index dabd629..fc0e709 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -209,6 +209,8 @@ LOCALE_PATHS = (
 
 AUTH_USER_MODEL = 'accounts.User'
 
+ALLOWED_HOSTS = ['colab.interlegis.leg.br']
+
 from django.contrib.messages import constants as messages
 MESSAGE_TAGS = {
     messages.INFO: 'alert-info',
@@ -227,6 +229,8 @@ FEEDZILLA_SITE_DESCRIPTION = gettext(u'Colab blog aggregator')
 
 ### BrowserID / Persona
 SITE_URL = 'https://colab.interlegis.leg.br'
+BROWSERID_AUDIENCES = [SITE_URL]
+
 
 LOGIN_URL = '/'
 LOGIN_REDIRECT_URL = '/'
@@ -235,27 +239,20 @@ LOGOUT_REDIRECT_URL = '/'
 BROWSERID_CREATE_USER = False
 
 
-### Apache Solr
-#SOLR_HOSTNAME = 'solr.interlegis.leg.br'
-SOLR_HOSTNAME = '10.1.2.154'
-SOLR_PORT = '8080'
-SOLR_SELECT_PATH = '/solr/select'
-
-SOLR_COLAB_URI = 'http://colab.interlegis.leg.br'
-SOLR_BASE_QUERY = """
-    ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *])
-"""
-
+## Proxy settings
 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/'
 COLAB_CI_URL = 'http://jenkins.interlegis.leg.br:8080/ci/'
 
 REVPROXY_ADD_REMOTE_USER = True
 
+
+## Converse.js settings
 # This URL must use SSL in order to keep chat sessions secure
 CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
 
 CONVERSEJS_AUTO_REGISTER = 'mensageiro.interlegis.gov.br'
 
+
 try:
     from local_settings import *
 except ImportError:
diff --git a/src/colab/local_settings-dev.py b/src/colab/local_settings-dev.py
index 81e3a83..c59a7dc 100644
--- a/src/colab/local_settings-dev.py
+++ b/src/colab/local_settings-dev.py
@@ -19,6 +19,8 @@ SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'
 
 SITE_URL = 'http://localhost:8000'
 
+ALLOWED_HOSTS = ['*']
+
 INTERNAL_IPS = ('127.0.0.1', )
 
 CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
--
libgit2 0.21.2