From cbd04c5f90999cac1918680d2f36994d1b3c0bdf Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Sat, 20 Sep 2014 19:36:37 -0300
Subject: [PATCH] Updated trac releated settings

---
 src/colab/custom_settings.py    |  2 +-
 src/colab/local_settings-dev.py | 19 ++++++++++---------
 src/colab/trac_settings.py      | 12 ------------
 3 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 src/colab/trac_settings.py

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index faaf8e4..f03d9b7 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -88,7 +88,7 @@ CACHES = {
 
 DATABASE_ROUTERS = []
 
-INSTALLED_APPS = INSTALLED_APPS + (
+INSTALLED_APPS += (
     # First app to provide  AUTH_USER_MODEL to others
     'accounts',
 
diff --git a/src/colab/local_settings-dev.py b/src/colab/local_settings-dev.py
index 8cf4d00..ede2a03 100644
--- a/src/colab/local_settings-dev.py
+++ b/src/colab/local_settings-dev.py
@@ -29,14 +29,6 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
 DATABASES['default']['PASSWORD'] = 'colab'
 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'
-
 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
 
 COLAB_TRAC_URL = 'http://localhost:5000/trac/'
@@ -51,10 +43,19 @@ DIAZO_THEME = SITE_URL
 
 ROBOTS_NOINDEX = True
 
+
 ### Trac Settings
 
-INSTALLED_APPS = INSTALLED_APPS + (
+INSTALLED_APPS += (
     'proxy.trac',
 )
 
 DATABASE_ROUTERS += ['proxy.trac.routers.TracRouter']
+
+DATABASES['trac'] = {
+    'ENGINE': 'django.db.backends.postgresql_psycopg2',
+    'NAME': 'trac_colab',
+    'USER': 'colab',
+    'PASSWORD': 'colab',
+    'HOST': 'localhost',
+}
diff --git a/src/colab/trac_settings.py b/src/colab/trac_settings.py
deleted file mode 100644
index 39fed11..0000000
--- a/src/colab/trac_settings.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import os
-
-
-TRAC_DATABASE = {
-    'ENGINE': 'django.db.backends.postgresql_psycopg2',
-    'NAME': 'trac_colab',
-    'USER': 'colab',
-    'PASSWORD': os.environ.get('COLAB_TRAC_DB_PWD'),
-    'HOST': os.environ.get('COLAB_TRAC_DB_HOST'),
-}
-
-COLAB_TRAC_URL = 'localhost:5000/trac/'
--
libgit2 0.21.2