Download as
Browse Code »

Commit 28138f49bbb07d0450fe350a28367bba1051902e

Authored by Marco
1 parent 3f665768
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

Remove trac settings from django settings

Showing 3 changed files with 23 additions and 11 deletions   Show diff stats
src/colab/custom_settings.py
  Diff comments   View file @28138f4
@@ -77,13 +77,6 @@ DATABASES = { @@ -77,13 +77,6 @@ DATABASES = {
77 'PASSWORD': os.environ.get('COLAB_DEFAULT_DB_PWD'), 77 'PASSWORD': os.environ.get('COLAB_DEFAULT_DB_PWD'),
78 'HOST': os.environ.get('COLAB_DEFAULT_DB_HOST'), 78 'HOST': os.environ.get('COLAB_DEFAULT_DB_HOST'),
79 }, 79 },
80 - 'trac': {  
81 - 'ENGINE': 'django.db.backends.postgresql_psycopg2',  
82 - 'NAME': 'trac_colab',  
83 - 'USER': 'colab',  
84 - 'PASSWORD': os.environ.get('COLAB_TRAC_DB_PWD'),  
85 - 'HOST': os.environ.get('COLAB_TRAC_DB_HOST'),  
86 - }  
87 } 80 }
88 81
89 CACHES = { 82 CACHES = {
@@ -262,6 +255,14 @@ MESSAGE_TAGS = { @@ -262,6 +255,14 @@ MESSAGE_TAGS = {
262 } 255 }
263 256
264 257
  258 +### Trac
  259 +TRAC_ENABLED = False
  260 +
  261 +if TRAC_ENABLED:
  262 + from trac_settings import *
  263 + DATABASES['trac'] = TRAC_DATABASE
  264 +
  265 +
265 ### Feedzilla (planet) 266 ### Feedzilla (planet)
266 from feedzilla.settings import * 267 from feedzilla.settings import *
267 FEEDZILLA_PAGE_SIZE = 5 268 FEEDZILLA_PAGE_SIZE = 5
@@ -286,7 +287,6 @@ BROWSERID_CREATE_USER = False @@ -286,7 +287,6 @@ BROWSERID_CREATE_USER = False
286 287
287 288
288 ## Proxy settings 289 ## Proxy settings
289 -COLAB_TRAC_URL = 'localhost:5000/trac/'  
290 COLAB_CI_URL = 'localhost:9000/ci/' 290 COLAB_CI_URL = 'localhost:9000/ci/'
291 291
292 REVPROXY_ADD_REMOTE_USER = True 292 REVPROXY_ADD_REMOTE_USER = True
src/colab/local_settings-dev.py
  Diff comments   View file @28138f4
@@ -27,12 +27,12 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind' @@ -27,12 +27,12 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
27 27
28 DATABASES['default']['PASSWORD'] = 'colab' 28 DATABASES['default']['PASSWORD'] = 'colab'
29 DATABASES['default']['HOST'] = 'localhost' 29 DATABASES['default']['HOST'] = 'localhost'
30 -DATABASES['trac']['PASSWORD'] = 'colab'  
31 -DATABASES['trac']['HOST'] = 'localhost' 30 +if TRAC_ENABLED:
  31 + DATABASES['trac']['PASSWORD'] = 'colab'
  32 + DATABASES['trac']['HOST'] = 'localhost'
32 33
33 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/' 34 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
34 35
35 -COLAB_TRAC_URL = 'http://localhost:5000/trac/'  
36 COLAB_CI_URL = 'http://localhost:8080/ci/' 36 COLAB_CI_URL = 'http://localhost:8080/ci/'
37 COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/' 37 COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
38 COLAB_REDMINE_URL = 'http://localhost:9080/redmine/' 38 COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'
src/colab/trac_settings.py 0 → 100644
  Diff comments   View file @28138f4
@@ -0,0 +1,12 @@ @@ -0,0 +1,12 @@
  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/'