diff --git a/k4ever/settings.py.template b/k4ever/settings.py.template index 479b1a4..c646fb7 100644 --- a/k4ever/settings.py.template +++ b/k4ever/settings.py.template @@ -78,14 +78,4 @@ if USE_LDAP: if not SECRET_KEY or SECRET_KEY == '': from django.core.exceptions import ImproperlyConfigured - raise ImproperlyConfigured("Please set a SECRET_KEY in your settings.py") - -TEMPLATE_CONTEXT_PROCESSORS = ( - "django.contrib.auth.context_processors.auth", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.media", - "django.core.context_processors.static", - "django.contrib.messages.context_processors.messages", - "django.core.context_processors.request", -) \ No newline at end of file + raise ImproperlyConfigured("Please set a SECRET_KEY in your settings.py") \ No newline at end of file diff --git a/k4ever/settings_default.py b/k4ever/settings_default.py index e183826..ca91bfb 100644 --- a/k4ever/settings_default.py +++ b/k4ever/settings_default.py @@ -6,21 +6,21 @@ PISTON_DISPLAY_ERRORS = DEBUG DEBUG_PROPOGATE_EXCEPTIONS = DEBUG ADMINS = ( - # ('Your Name', 'your_email@domain.com'), + # ('Your Name', 'your_email@domain.com'), ) MANAGERS = ADMINS # use sqlite by default DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. - 'NAME': 'k4ever.db', # Or path to database file if using sqlite3. - 'USER': '', # Not used with sqlite3. - 'PASSWORD': '', # Not used with sqlite3. - 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. - 'PORT': '', # Set to empty string for default. Not used with sqlite3. - } + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'. + 'NAME': 'k4ever.db', # Or path to database file if using sqlite3. + 'USER': '', # Not used with sqlite3. + 'PASSWORD': '', # Not used with sqlite3. + 'HOST': '', # Set to empty string for localhost. Not used with sqlite3. + 'PORT': '', # Set to empty string for default. Not used with sqlite3. + } } # Default model ids for some purposes @@ -83,17 +83,17 @@ AUTHENTICATION_BACKENDS = ( # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', 'django.template.loaders.app_directories.load_template_source', ) MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', ) ROOT_URLCONF = 'k4ever.urls' @@ -105,15 +105,24 @@ TEMPLATE_DIRS = ( ) INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.messages', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.sites', + 'django.contrib.messages', 'buyable', 'transaction', 'main', - 'django.contrib.admin', - 'easy_thumbnails', + 'django.contrib.admin', + 'easy_thumbnails', ) +TEMPLATE_CONTEXT_PROCESSORS = ( + "django.contrib.auth.context_processors.auth", + "django.core.context_processors.debug", + "django.core.context_processors.i18n", + "django.core.context_processors.media", + "django.core.context_processors.static", + "django.contrib.messages.context_processors.messages", + "django.core.context_processors.request", +) \ No newline at end of file