Moved trac stuff to local_settings-dev

Sergio Oliveira
1 parent 22d2c172
Showing 2 changed files with 9 additions and 10 deletions Show diff stats
src/colab/custom_settings.py
src/colab/local_settings-dev.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',
-    )
@@ -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']
...	...	@@ -86,7 +86,7 @@ CACHES = {
86	86	}
87	87	}
88	88
89		-DATABASE_ROUTERS = ['proxy.trac.routers.TracRouter',]
	89	+DATABASE_ROUTERS = []
90	90
91	91	INSTALLED_APPS = INSTALLED_APPS + (
92	92	# First app to provide AUTH_USER_MODEL to others
...	...	@@ -308,16 +308,7 @@ DPASTE_EXPIRE_DEFAULT = DPASTE_EXPIRE_CHOICES[4][0]
308	308	DPASTE_DEFAULT_GIST_DESCRIPTION = 'Gist created on Colab Interlegis'
309	309	DPASTE_DEFAULT_GIST_NAME = 'colab_paste'
310	310
311		-
312		-### Trac
313		-TRAC_ENABLED = False
314		-
315	311	try:
316	312	from local_settings import *
317	313	except ImportError:
318	314	pass
319		-
320		-if TRAC_ENABLED:
321		- INSTALLED_APPS = INSTALLED_APPS + (
322		- 'proxy.trac',
323		- )
...	...
...	...	@@ -50,3 +50,11 @@ CONVERSEJS_ENABLED = False
50	50	DIAZO_THEME = SITE_URL
51	51
52	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']
...	...