Download as
Browse Code »

Commit f8d788adf5f181ed2cdab1b9011a852ef5454849

Authored by Sergio Oliveira
1 parent 59bdea42
Exists in master and in 13 other branches Validation_colab_sprint_30, check-port, generic-plugins, header_footer, mezuro-integration, move_out_plugins, plugin_extra_configs, proxy_base_template, proxy_hotspot, spb-release/3.0, stable, test, trac_indexing

Updating settings

Showing 3 changed files with 10 additions and 4 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @f8d788a
@@ -156,7 +156,7 @@ FEEDZILLA_SITE_DESCRIPTION = gettext(u'Colab blog aggregator') @@ -156,7 +156,7 @@ FEEDZILLA_SITE_DESCRIPTION = gettext(u'Colab blog aggregator')
156 156
157 157
158 ### BrowserID / Persona 158 ### BrowserID / Persona
159 -SITE_URL = 'http://colab.interlegis.leg.br' 159 +SITE_URL = 'https://colab.interlegis.leg.br'
160 160
161 LOGIN_REDIRECT_URL = '/' 161 LOGIN_REDIRECT_URL = '/'
162 LOGIN_REDIRECT_URL_FAILURE = '/' 162 LOGIN_REDIRECT_URL_FAILURE = '/'
@@ -177,10 +177,11 @@ SOLR_BASE_QUERY = """ @@ -177,10 +177,11 @@ SOLR_BASE_QUERY = """
177 177
178 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/' 178 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/'
179 179
180 -CONVERSEJS_BOSH_SERVICE_URL = 'https://bind.opkode.im'  
181 -  
182 REVPROXY_ADD_REMOTE_USER = True 180 REVPROXY_ADD_REMOTE_USER = True
183 181
  182 +# This URL must use SSL in order to keep chat sessions secure
  183 +CONVERSEJS_BOSH_SERVICE_URL = SITE_URL + '/http-bind'
  184 +
184 try: 185 try:
185 from local_settings import * 186 from local_settings import *
186 except ImportError: 187 except ImportError:
src/colab/local_settings-dev.py
  Diff comments   View file @f8d788a
@@ -21,3 +21,8 @@ SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj' @@ -21,3 +21,8 @@ SECRET_KEY = ')(jksdfhsjkadfhjkh234ns!8fqu-1186h$vuj'
21 #SOCKS_PORT = 9050 21 #SOCKS_PORT = 9050
22 22
23 SITE_URL = 'http://localhost:8000' 23 SITE_URL = 'http://localhost:8000'
  24 +
  25 +INTERNAL_IPS = ('127.0.0.1', )
  26 +
  27 +CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
  28 +
src/colab/urls.py
  Diff comments   View file @f8d788a
@@ -34,5 +34,5 @@ urlpatterns = patterns('', @@ -34,5 +34,5 @@ urlpatterns = patterns('',
34 34
35 # Trac URLs 35 # Trac URLs
36 url(u'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment).*)$', 36 url(u'^(?P<path>(?:admin|wiki|changeset|newticket|ticket|chrome|timeline|roadmap|browser|report|tags|query|about|prefs|log|attachment|raw-attachment).*)$',
37 - 'revproxy.views.proxy', {'base_url': settings.COLAB_TRAC_URL}) 37 + 'revproxy.views.proxy', {'base_url': settings.COLAB_TRAC_URL}),
38 ) 38 )