From 58b16916387b61a170208aa221a77378b9e09e14 Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Fri, 11 Mar 2011 12:44:25 +0000
Subject: [PATCH] Move local settings to "conf" module

---
 conf/__init__.py                                            | 0
 brokersettings.py.example => conf/brokersettings.py.example | 0
 dbsettings.py.example => conf/dbsettings.py.example         | 0
 settings.py                                                 | 6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 conf/__init__.py
 rename brokersettings.py.example => conf/brokersettings.py.example (100%)
 rename dbsettings.py.example => conf/dbsettings.py.example (100%)

diff --git a/conf/__init__.py b/conf/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/brokersettings.py.example b/conf/brokersettings.py.example
similarity index 100%
rename from brokersettings.py.example
rename to conf/brokersettings.py.example
diff --git a/dbsettings.py.example b/conf/dbsettings.py.example
similarity index 100%
rename from dbsettings.py.example
rename to conf/dbsettings.py.example
diff --git a/settings.py b/settings.py
index 1c76e67..401cc63 100755
--- a/settings.py
+++ b/settings.py
@@ -15,10 +15,10 @@ ADMINS = (
 MANAGERS = ADMINS
 
 # Import db settings from dbsettings.py
-from dbsettings import *
+from conf.dbsettings import *
 
 # Import the Broker settings
-from brokersettings import *
+from conf.brokersettings import *
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -167,7 +167,7 @@ EVE_PROXY_KEEP_LOGS = 30
 
 # try and import local settings
 try:
-    from settingslocal import *
+    from conf.settingslocal import *
 except:
     pass