X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=settings.py;h=98be51ff05ebb69d1202f9de2b2095e11e19e135;hb=6766edae0f027f1ac392b11e62dbb4485000a58b;hp=5f3fcbd750cca39a1fa29595797ae33e77f1c9ec;hpb=81df86a181be0c659f6dab9473b644417aa13b93;p=matthijs%2Fprojects%2Fdorestad-bookings.git

diff --git a/settings.py b/settings.py
index 5f3fcbd..98be51f 100644
--- a/settings.py
+++ b/settings.py
@@ -1,27 +1,29 @@
 # Django settings for dorestad1493 project.
 
+import os
+
+PROJECT_DIR = os.path.dirname(__file__)
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
 ADMINS = (
-    # ('Your Name', 'your_email@domain.com'),
+    # Server errors get sent here
+    ('Matthijs Kooijman', 'matthijs@stdin.nl'),
 )
 
 MANAGERS = ADMINS
 
-DATABASE_ENGINE = ''           # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = ''             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+# Import database settings from a default file (so we can keep those out
+# of git).
+from dbsettings import *
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
 # If running in a Windows environment this must be set to the same as your
 # system time zone.
-TIME_ZONE = 'America/Chicago'
+TIME_ZONE = 'Europe/Amsterdam'
 
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
@@ -69,7 +71,16 @@ TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
+    os.path.join(PROJECT_DIR, 'templates'),
 )
 
 INSTALLED_APPS = (
+    'tickets',
 )
+
+# Import local settings, that are specific to this installation. These
+# can override any settings specified here.
+try:
+    from localsettings import *
+except ImportError:
+    pass