Updating settings

Sergio Oliveira
1 parent bc3861f7
Showing 2 changed files with 10 additions and 11 deletions Show diff stats
src/colab/custom_settings.py
src/colab/local_settings-dev.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&#39;Colab blog aggregator&#39;)
  
 ### 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 = &#39;/&#39;
 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:
@@ -19,6 +19,8 @@ SECRET_KEY = &#39;)(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj&#39;
  
 SITE_URL = 'http://localhost:8000'
  
+ALLOWED_HOSTS = ['*']
+
 INTERNAL_IPS = ('127.0.0.1', )
  
 CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
...	...	@@ -209,6 +209,8 @@ LOCALE_PATHS = (
209	209
210	210	AUTH_USER_MODEL = 'accounts.User'
211	211
	212	+ALLOWED_HOSTS = ['colab.interlegis.leg.br']
	213	+
212	214	from django.contrib.messages import constants as messages
213	215	MESSAGE_TAGS = {
214	216	messages.INFO: 'alert-info',
...	...	@@ -227,6 +229,8 @@ FEEDZILLA_SITE_DESCRIPTION = gettext(u'Colab blog aggregator')
227	229
228	230	### BrowserID / Persona
229	231	SITE_URL = 'https://colab.interlegis.leg.br'
	232	+BROWSERID_AUDIENCES = [SITE_URL]
	233	+
230	234
231	235	LOGIN_URL = '/'
232	236	LOGIN_REDIRECT_URL = '/'
...	...	@@ -235,27 +239,20 @@ LOGOUT_REDIRECT_URL = '/'
235	239	BROWSERID_CREATE_USER = False
236	240
237	241
238		-### Apache Solr
239		-#SOLR_HOSTNAME = 'solr.interlegis.leg.br'
240		-SOLR_HOSTNAME = '10.1.2.154'
241		-SOLR_PORT = '8080'
242		-SOLR_SELECT_PATH = '/solr/select'
243		-
244		-SOLR_COLAB_URI = 'http://colab.interlegis.leg.br'
245		-SOLR_BASE_QUERY = """
246		- ((Type:changeset OR Type:ticket OR Type:wiki OR Type:thread) AND Title:["" TO *])
247		-"""
248		-
	242	+## Proxy settings
249	243	COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/'
250	244	COLAB_CI_URL = 'http://jenkins.interlegis.leg.br:8080/ci/'
251	245
252	246	REVPROXY_ADD_REMOTE_USER = True
253	247
	248	+
	249	+## Converse.js settings
254	250	# This URL must use SSL in order to keep chat sessions secure
255	251	CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
256	252
257	253	CONVERSEJS_AUTO_REGISTER = 'mensageiro.interlegis.gov.br'
258	254
	255	+
259	256	try:
260	257	from local_settings import *
261	258	except ImportError:
...	...
...	...	@@ -19,6 +19,8 @@ SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'
19	19
20	20	SITE_URL = 'http://localhost:8000'
21	21
	22	+ALLOWED_HOSTS = ['*']
	23	+
22	24	INTERNAL_IPS = ('127.0.0.1', )
23	25
24	26	CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
...	...