From 687bfc77b9c765aa8c8e0eb99f5cb665d03bc422 Mon Sep 17 00:00:00 2001
From: Arthur Darcet <arthur.darcet@m4x.org>
Date: Sat, 2 Feb 2013 21:39:13 +0100
Subject: [PATCH] Split settings in base/dev/personal

---
 .gitignore                             |  5 ++++-
 xnet/settings/__init__.py              |  4 ++++
 xnet/{settings.py => settings/base.py} |  9 +--------
 xnet/settings/dev.py                   | 11 +++++++++++
 xnet/settings/personal.py.tpl          |  1 +
 5 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 xnet/settings/__init__.py
 rename xnet/{settings.py => settings/base.py} (96%)
 create mode 100644 xnet/settings/dev.py
 create mode 100644 xnet/settings/personal.py.tpl

diff --git a/.gitignore b/.gitignore
index 1f0afd1..ca5f862 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,10 +4,13 @@
 *.pyo
 
 # Private files
-xnet/db.sqlite
 xnet/private/
 xnet/media/
 
+# Dev files
+xnet/db.sqlite
+xnet/settings/personal.py
+
 # Build-related files
 doc/_build/
 .coverage
diff --git a/xnet/settings/__init__.py b/xnet/settings/__init__.py
new file mode 100644
index 0000000..5c54767
--- /dev/null
+++ b/xnet/settings/__init__.py
@@ -0,0 +1,4 @@
+try:
+    from .personal import *
+except ImportError:
+    from .dev import *
diff --git a/xnet/settings.py b/xnet/settings/base.py
similarity index 96%
rename from xnet/settings.py
rename to xnet/settings/base.py
index a23093c..99e7fc7 100644
--- a/xnet/settings.py
+++ b/xnet/settings/base.py
@@ -4,7 +4,7 @@ DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 import os.path
-ROOT_DIR = os.path.abspath(os.path.dirname(__file__))
+ROOT_DIR = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 
 def read_pass(name):
     fname = os.path.join(ROOT_DIR, 'private', name)
@@ -17,13 +17,6 @@ ADMINS = (
 
 MANAGERS = ADMINS
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(ROOT_DIR, 'db.sqlite'),
-    }
-}
-
 AUTHENTICATION_BACKENDS = (
     'django_authgroupex.auth.AuthGroupeXBackend',
 )
diff --git a/xnet/settings/dev.py b/xnet/settings/dev.py
new file mode 100644
index 0000000..2ad4b73
--- /dev/null
+++ b/xnet/settings/dev.py
@@ -0,0 +1,11 @@
+from .base import *
+
+DEBUG = True
+TEMPLATE_DEBUG = DEBUG
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': os.path.join(ROOT_DIR, 'db.sqlite'),
+    }
+}
diff --git a/xnet/settings/personal.py.tpl b/xnet/settings/personal.py.tpl
new file mode 100644
index 0000000..c787328
--- /dev/null
+++ b/xnet/settings/personal.py.tpl
@@ -0,0 +1 @@
+from .dev import *
-- 
2.1.4