From f077badf3163fc36c111dc45fe8d7d6f57d8712a Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Fri, 8 Nov 2013 09:31:01 +0200 Subject: Merged motor and checkin --- motor/settings.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'motor/settings.py') diff --git a/motor/settings.py b/motor/settings.py index 5afd5fa..d085f13 100644 --- a/motor/settings.py +++ b/motor/settings.py @@ -2,9 +2,8 @@ import os import motor as project_module -PROJECT_DIR = os.path.dirname(os.path.realpath(project_module.__file__)) - -DEBUG = False +PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.realpath(project_module.__file__))) +DEBUG = True TEMPLATE_DEBUG = DEBUG ADMINS = ( @@ -15,13 +14,15 @@ MANAGERS = ADMINS DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'motor.db', # Or path to database file if using sqlite3. + # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': 'motor.db', # Or path to database file if using sqlite3. # The following settings are not used with sqlite3: 'USER': '', 'PASSWORD': '', - 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. - 'PORT': '', # Set to empty string for default. + # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. + 'HOST': '', + 'PORT': '', # Set to empty string for default. } } @@ -84,7 +85,7 @@ STATICFILES_DIRS = ( STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', -# 'django.contrib.staticfiles.finders.DefaultStorageFinder', + #'django.contrib.staticfiles.finders.DefaultStorageFinder', ) # Make this unique, and don't share it with anybody. @@ -123,14 +124,13 @@ INSTALLED_APPS = ( 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', - 'django.contrib.sites', 'django.contrib.messages', 'django.contrib.staticfiles', # Uncomment the next line to enable the admin: - 'django.contrib.admin', + #'django.contrib.admin', # Uncomment the next line to enable admin documentation: # 'django.contrib.admindocs', - 'docs', + 'apps.core', 'apps.docs', 'apps.checkin', 'apps.troubleshooting' ) # A sample logging configuration. The only tangible logging @@ -169,3 +169,5 @@ TEMPLATE_CONTEXT_PROCESSORS = ( "django.core.context_processors.i18n", "django.contrib.messages.context_processors.messages", ) + +AUTH_USER_MODEL = 'core.User' -- cgit v1.2.3