Download as
Browse Code »

Commit f8d788adf5f181ed2cdab1b9011a852ef5454849

Authored by Sergio Oliveira
1 parent 59bdea42
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

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 156  
157 157  
158 158 ### BrowserID / Persona
159   -SITE_URL = 'http://colab.interlegis.leg.br'
  159 +SITE_URL = 'https://colab.interlegis.leg.br'
160 160  
161 161 LOGIN_REDIRECT_URL = '/'
162 162 LOGIN_REDIRECT_URL_FAILURE = '/'
... ... @@ -177,10 +177,11 @@ SOLR_BASE_QUERY = """
177 177  
178 178 COLAB_TRAC_URL = 'http://colab-backend.interlegis.leg.br/'
179 179  
180   -CONVERSEJS_BOSH_SERVICE_URL = 'https://bind.opkode.im'
181   -
182 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 185 try:
185 186 from local_settings import *
186 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 21 #SOCKS_PORT = 9050
22 22  
23 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 34  
35 35 # Trac URLs
36 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 )
... ...