From 28138f49bbb07d0450fe350a28367bba1051902e Mon Sep 17 00:00:00 2001
From: Marco Rougeth <marco@rougeth.com>
Date: Fri, 1 Aug 2014 14:38:40 +0000
Subject: [PATCH] Remove trac settings from django settings

---
 src/colab/custom_settings.py    | 16 ++++++++--------
 src/colab/local_settings-dev.py |  6 +++---
 src/colab/trac_settings.py      | 12 ++++++++++++
 3 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 src/colab/trac_settings.py

diff --git a/src/colab/custom_settings.py b/src/colab/custom_settings.py
index 43cfded..0160847 100644
--- a/src/colab/custom_settings.py
+++ b/src/colab/custom_settings.py
@@ -77,13 +77,6 @@ DATABASES = {
         'PASSWORD': os.environ.get('COLAB_DEFAULT_DB_PWD'),
         'HOST': os.environ.get('COLAB_DEFAULT_DB_HOST'),
     },
-    'trac': {
-        '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'),
-    }
 }
 
 CACHES = {
@@ -262,6 +255,14 @@ MESSAGE_TAGS = {
 }
 
 
+### Trac
+TRAC_ENABLED = False
+
+if TRAC_ENABLED:
+    from trac_settings import *
+    DATABASES['trac'] = TRAC_DATABASE
+
+
 ### Feedzilla  (planet)
 from feedzilla.settings import *
 FEEDZILLA_PAGE_SIZE = 5
@@ -286,7 +287,6 @@ BROWSERID_CREATE_USER = False
 
 
 ## Proxy settings
-COLAB_TRAC_URL = 'localhost:5000/trac/'
 COLAB_CI_URL = 'localhost:9000/ci/'
 
 REVPROXY_ADD_REMOTE_USER = True
diff --git a/src/colab/local_settings-dev.py b/src/colab/local_settings-dev.py
index 9f6c306..7eb8671 100644
--- a/src/colab/local_settings-dev.py
+++ b/src/colab/local_settings-dev.py
@@ -27,12 +27,12 @@ CONVERSEJS_BOSH_SERVICE_URL = 'http://localhost:5280/http-bind'
 
 DATABASES['default']['PASSWORD'] = 'colab'
 DATABASES['default']['HOST'] = 'localhost'
-DATABASES['trac']['PASSWORD'] = 'colab'
-DATABASES['trac']['HOST'] = 'localhost'
+if TRAC_ENABLED:
+    DATABASES['trac']['PASSWORD'] = 'colab'
+    DATABASES['trac']['HOST'] = 'localhost'
 
 HAYSTACK_CONNECTIONS['default']['URL'] = 'http://localhost:8983/solr/'
 
-COLAB_TRAC_URL = 'http://localhost:5000/trac/'
 COLAB_CI_URL = 'http://localhost:8080/ci/'
 COLAB_GITLAB_URL = 'http://localhost:8090/gitlab/'
 COLAB_REDMINE_URL = 'http://localhost:9080/redmine/'
diff --git a/src/colab/trac_settings.py b/src/colab/trac_settings.py
new file mode 100644
index 0000000..39fed11
--- /dev/null
+++ b/src/colab/trac_settings.py
@@ -0,0 +1,12 @@
+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