From c32651899bb238a92d3ebb76af2d93333c983306 Mon Sep 17 00:00:00 2001 From: Sergio Oliveira Date: Sat, 20 Sep 2014 18:58:22 -0300 Subject: [PATCH] Moved trac stuff to local_settings-dev --- src/colab/custom_settings.py | 11 +---------- src/colab/local_settings-dev.py | 8 ++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py index be46c96..faaf8e4 100644 --- a/src/colab/custom_settings.py +++ b/src/colab/custom_settings.py @@ -86,7 +86,7 @@ CACHES = { } } -DATABASE_ROUTERS = ['proxy.trac.routers.TracRouter',] +DATABASE_ROUTERS = [] INSTALLED_APPS = INSTALLED_APPS + ( # First app to provide AUTH_USER_MODEL to others @@ -308,16 +308,7 @@ DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0] DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis' DPASTE_DEFAULT_GIST_NAME = 'colab_paste' - -### Trac -TRAC_ENABLED = False - try: from local_settings import * except ImportError: pass - -if TRAC_ENABLED: - INSTALLED_APPS = INSTALLED_APPS + ( - 'proxy.trac', - ) diff --git a/src/colab/local_settings-dev.py b/src/colab/local_settings-dev.py index 29547fa..8cf4d00 100644 --- a/src/colab/local_settings-dev.py +++ b/src/colab/local_settings-dev.py @@ -50,3 +50,11 @@ CONVERSEJS_ENABLED = False DIAZO_THEME = SITE_URL ROBOTS_NOINDEX = True + +### Trac Settings + +INSTALLED_APPS = INSTALLED_APPS + ( + 'proxy.trac', +) + +DATABASE_ROUTERS += ['proxy.trac.routers.TracRouter'] -- libgit2 0.21.2