Download as
Browse Code »

Commit cbd04c5f90999cac1918680d2f36994d1b3c0bdf

Authored by Sergio Oliveira
1 parent c3265189
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

Updated trac releated settings

Showing 3 changed files with 11 additions and 22 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @cbd04c5
... ... @@ -88,7 +88,7 @@ CACHES = {
88 88  
89 89 DATABASE_ROUTERS = []
90 90  
91   -INSTALLED_APPS = INSTALLED_APPS + (
  91 +INSTALLED_APPS += (
92 92 # First app to provide AUTH_USER_MODEL to others
93 93 'accounts',
94 94  
... ...
src/colab/local_settings-dev.py
  Diff comments   View file @cbd04c5
... ... @@ -29,14 +29,6 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
29 29 DATABASES['default']['PASSWORD'] = 'colab'
30 30 DATABASES['default']['HOST'] = 'localhost'
31 31  
32   -TRAC_ENABLED = False
33   -
34   -if TRAC_ENABLED:
35   - from trac_settings import *
36   - DATABASES['trac'] = TRAC_DATABASE
37   - DATABASES['trac']['PASSWORD'] = 'colab'
38   - DATABASES['trac']['HOST'] = 'localhost'
39   -
40 32 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
41 33  
42 34 COLAB_TRAC_URL = 'http://localhost:5000/trac/'
... ... @@ -51,10 +43,19 @@ DIAZO_THEME = SITE_URL
51 43  
52 44 ROBOTS_NOINDEX = True
53 45  
  46 +
54 47 ### Trac Settings
55 48  
56   -INSTALLED_APPS = INSTALLED_APPS + (
  49 +INSTALLED_APPS += (
57 50 'proxy.trac',
58 51 )
59 52  
60 53 DATABASE_ROUTERS += ['proxy.trac.routers.TracRouter']
  54 +
  55 +DATABASES['trac'] = {
  56 + 'ENGINE': 'django.db.backends.postgresql_psycopg2',
  57 + 'NAME': 'trac_colab',
  58 + 'USER': 'colab',
  59 + 'PASSWORD': 'colab',
  60 + 'HOST': 'localhost',
  61 +}
... ...
src/colab/trac_settings.py
View file @c326518
... ... @@ -1,12 +0,0 @@
1   -import os
2   -
3   -
4   -TRAC_DATABASE = {
5   - 'ENGINE': 'django.db.backends.postgresql_psycopg2',
6   - 'NAME': 'trac_colab',
7   - 'USER': 'colab',
8   - 'PASSWORD': os.environ.get('COLAB_TRAC_DB_PWD'),
9   - 'HOST': os.environ.get('COLAB_TRAC_DB_HOST'),
10   -}
11   -
12   -COLAB_TRAC_URL = 'localhost:5000/trac/'