Commit a3acbdfde9a453d3c46c1ca931b88fab6e1d3e9c
1 parent
5b55538c
Exists in
master
and in
39 other branches
Adding database only if trac is on
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Matheus Faria <matheus.sousa.faria@gmail.com>
Showing
2 changed files
with
2 additions
and
3 deletions
Show diff stats
src/colab/custom_settings.py
@@ -313,9 +313,6 @@ DPASTE_DEFAULT_GIST_NAME = 'colab_paste' | @@ -313,9 +313,6 @@ DPASTE_DEFAULT_GIST_NAME = 'colab_paste' | ||
313 | ### Trac | 313 | ### Trac |
314 | TRAC_ENABLED = False | 314 | TRAC_ENABLED = False |
315 | 315 | ||
316 | -from trac_settings import * | ||
317 | -DATABASES['trac'] = TRAC_DATABASE | ||
318 | - | ||
319 | try: | 316 | try: |
320 | from local_settings import * | 317 | from local_settings import * |
321 | except ImportError: | 318 | except ImportError: |
src/colab/local_settings-dev.py
@@ -31,6 +31,8 @@ DATABASES['default']['HOST'] = 'localhost' | @@ -31,6 +31,8 @@ DATABASES['default']['HOST'] = 'localhost' | ||
31 | TRAC_ENABLED = False | 31 | TRAC_ENABLED = False |
32 | 32 | ||
33 | if TRAC_ENABLED: | 33 | if TRAC_ENABLED: |
34 | + from trac_settings import * | ||
35 | + DATABASES['trac'] = TRAC_DATABASE | ||
34 | DATABASES['trac']['PASSWORD'] = 'colab' | 36 | DATABASES['trac']['PASSWORD'] = 'colab' |
35 | DATABASES['trac']['HOST'] = 'localhost' | 37 | DATABASES['trac']['HOST'] = 'localhost' |
36 | 38 |