Commit c32651899bb238a92d3ebb76af2d93333c983306
1 parent
22d2c172
Exists in
master
and in
39 other branches
Moved trac stuff to local_settings-dev
Showing
2 changed files
with
9 additions
and
10 deletions
Show diff stats
src/colab/custom_settings.py
| @@ -86,7 +86,7 @@ CACHES = { | @@ -86,7 +86,7 @@ CACHES = { | ||
| 86 | } | 86 | } |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | -DATABASE_ROUTERS = ['proxy.trac.routers.TracRouter',] | 89 | +DATABASE_ROUTERS = [] |
| 90 | 90 | ||
| 91 | INSTALLED_APPS = INSTALLED_APPS + ( | 91 | INSTALLED_APPS = INSTALLED_APPS + ( |
| 92 | # First app to provide AUTH_USER_MODEL to others | 92 | # First app to provide AUTH_USER_MODEL to others |
| @@ -308,16 +308,7 @@ DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0] | @@ -308,16 +308,7 @@ DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0] | ||
| 308 | DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis' | 308 | DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis' |
| 309 | DPASTE_DEFAULT_GIST_NAME = 'colab_paste' | 309 | DPASTE_DEFAULT_GIST_NAME = 'colab_paste' |
| 310 | 310 | ||
| 311 | - | ||
| 312 | -### Trac | ||
| 313 | -TRAC_ENABLED = False | ||
| 314 | - | ||
| 315 | try: | 311 | try: |
| 316 | from local_settings import * | 312 | from local_settings import * |
| 317 | except ImportError: | 313 | except ImportError: |
| 318 | pass | 314 | pass |
| 319 | - | ||
| 320 | -if TRAC_ENABLED: | ||
| 321 | - INSTALLED_APPS = INSTALLED_APPS + ( | ||
| 322 | - 'proxy.trac', | ||
| 323 | - ) |
src/colab/local_settings-dev.py
| @@ -50,3 +50,11 @@ CONVERSEJS_ENABLED = False | @@ -50,3 +50,11 @@ CONVERSEJS_ENABLED = False | ||
| 50 | DIAZO_THEME = SITE_URL | 50 | DIAZO_THEME = SITE_URL |
| 51 | 51 | ||
| 52 | ROBOTS_NOINDEX = True | 52 | ROBOTS_NOINDEX = True |
| 53 | + | ||
| 54 | +### Trac Settings | ||
| 55 | + | ||
| 56 | +INSTALLED_APPS = INSTALLED_APPS + ( | ||
| 57 | + 'proxy.trac', | ||
| 58 | +) | ||
| 59 | + | ||
| 60 | +DATABASE_ROUTERS += ['proxy.trac.routers.TracRouter'] |