From 935957afae56541749426d04718d60a2346fb668 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 27 Jul 2015 17:19:19 -0300
Subject: [PATCH] Fixing database path

---
 colab/management/initconfig.py | 12 ++++++------
 colab/settings.py              |  9 ++++++++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/colab/management/initconfig.py b/colab/management/initconfig.py
index 6a22b88..64223eb 100644
--- a/colab/management/initconfig.py
+++ b/colab/management/initconfig.py
@@ -32,12 +32,12 @@ ALLOWED_HOSTS = [
 # SOCIAL_NETWORK_ENABLED = True
 
 ## Database settings
-DATABASES = {{
-    'default': {{
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': 'colab.sqlite3',
-    }}
-}}
+# DATABASES = {{
+#     'default': {{
+#         'ENGINE': 'django.db.backends.sqlite3',
+#         'NAME': '/path/to/colab.sqlite3',
+#     }}
+# }}
 
 ## Disable indexing
 ROBOTS_NOINDEX = False
diff --git a/colab/settings.py b/colab/settings.py
index 57c2aed..7bc3b8b 100644
--- a/colab/settings.py
+++ b/colab/settings.py
@@ -168,7 +168,14 @@ HAYSTACK_CUSTOM_HIGHLIGHTER = 'colab.utils.highlighting.ColabHighlighter'
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
-        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
+        'PATH': os.path.join(BASE_DIR, 'whoosh_index'),
+    }
+}
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(BASE_DIR, 'colab.sqlite3'),
     }
 }
 
--
libgit2 0.21.2