Merge branch 'master' of github.com:TracyWebTech/colab

Luan
2 parents cefe623f cc7294a2
Showing 4 changed files with 15 additions and 14 deletions Show diff stats
fabfile.py
src/colab/custom_settings.py
src/colab/local_settings-dev.py
src/planet/templates/feedzilla/index.html
@@ -70,7 +70,7 @@ def install(local_settings=None):
 def update_requirements():
     with cd('~/colab'), prefix(WORKON_COLAB):
-        run('pip install -r requirements.txt')
+        run('pip install -U -r requirements.txt')
 def deploy(update=False):
@@ -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'
@@ -8,9 +8,11 @@
   <hr>
   {% empty %}
     <h2>{% trans 'There is no RSS registered' %}</h2>
-    <h3>{% trans 'Please' %}
- href="{% url "feedzilla_submit_blog" %}">{% trans 'click here' %}</a>
+    <h3>
+      {% trans 'Please' %}
+      <a href="{% url "feedzilla_submit_blog" %}">{% trans 'click here' %}</a>
     {% trans 'to submit a blog' %}</h3>
+    </h3>
 {% endfor %}
 {% include "common/pagination.html" %}
	@@ -70,7 +70,7 @@ def install(local_settings=None):		@@ -70,7 +70,7 @@ def install(local_settings=None):
70		70
71	def update_requirements():	71	def update_requirements():
72	with cd('~/colab'), prefix(WORKON_COLAB):	72	with cd('~/colab'), prefix(WORKON_COLAB):
73	- run('pip install -r requirements.txt')	73	+ run('pip install -U -r requirements.txt')
74		74
75		75
76	def deploy(update=False):	76	def deploy(update=False):
	@@ -19,6 +19,8 @@ SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'		@@ -19,6 +19,8 @@ SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'
19		19
20	SITE_URL = 'http://localhost:8000'	20	SITE_URL = 'http://localhost:8000'
21		21
		22	+ALLOWED_HOSTS = ['*']
		23	+
22	INTERNAL_IPS = ('127.0.0.1', )	24	INTERNAL_IPS = ('127.0.0.1', )
23		25
24	CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'	26	CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'