diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index 9f87afe..2a8f8b2 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -313,9 +313,6 @@ DPASTE_DEFAULT_GIST_NAME = 'colab_paste' ### Trac TRAC_ENABLED = False -from trac_settings import * -DATABASES['trac'] = TRAC_DATABASE - try: from local_settings import * except ImportError: diff --git a/src/colab/local_settings-dev.py b/src/colab/local_settings-dev.py index d25a4a6..9e05528 100644 --- a/src/colab/local_settings-dev.py +++ b/src/colab/local_settings-dev.py @@ -31,6 +31,8 @@ DATABASES['default']['HOST'] = 'localhost' TRAC_ENABLED = False if TRAC_ENABLED: + from trac_settings import * + DATABASES['trac'] = TRAC_DATABASE DATABASES['trac']['PASSWORD'] = 'colab' DATABASES['trac']['HOST'] = 'localhost' -- libgit2 0.21.2