Commit cbd04c5f90999cac1918680d2f36994d1b3c0bdf
1 parent
c3265189
Exists in
master
and in
39 other branches
Updated trac releated settings
Showing
3 changed files
with
11 additions
and
22 deletions
Show diff stats
src/colab/custom_settings.py
| @@ -88,7 +88,7 @@ CACHES = { | @@ -88,7 +88,7 @@ CACHES = { | ||
| 88 | 88 | ||
| 89 | DATABASE_ROUTERS = [] | 89 | DATABASE_ROUTERS = [] |
| 90 | 90 | ||
| 91 | -INSTALLED_APPS = INSTALLED_APPS + ( | 91 | +INSTALLED_APPS += ( |
| 92 | # First app to provide AUTH_USER_MODEL to others | 92 | # First app to provide AUTH_USER_MODEL to others |
| 93 | 'accounts', | 93 | 'accounts', |
| 94 | 94 |
src/colab/local_settings-dev.py
| @@ -29,14 +29,6 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind' | @@ -29,14 +29,6 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind' | ||
| 29 | DATABASES['default']['PASSWORD'] = 'colab' | 29 | DATABASES['default']['PASSWORD'] = 'colab' |
| 30 | DATABASES['default']['HOST'] = 'localhost' | 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 | HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/' | 32 | HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/' |
| 41 | 33 | ||
| 42 | COLAB_TRAC_URL = 'http://localhost:5000/trac/' | 34 | COLAB_TRAC_URL = 'http://localhost:5000/trac/' |
| @@ -51,10 +43,19 @@ DIAZO_THEME = SITE_URL | @@ -51,10 +43,19 @@ DIAZO_THEME = SITE_URL | ||
| 51 | 43 | ||
| 52 | ROBOTS_NOINDEX = True | 44 | ROBOTS_NOINDEX = True |
| 53 | 45 | ||
| 46 | + | ||
| 54 | ### Trac Settings | 47 | ### Trac Settings |
| 55 | 48 | ||
| 56 | -INSTALLED_APPS = INSTALLED_APPS + ( | 49 | +INSTALLED_APPS += ( |
| 57 | 'proxy.trac', | 50 | 'proxy.trac', |
| 58 | ) | 51 | ) |
| 59 | 52 | ||
| 60 | DATABASE_ROUTERS += ['proxy.trac.routers.TracRouter'] | 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
| @@ -1,12 +0,0 @@ | @@ -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/' |