From 2e6a74760ff80611fca54ab972580f607acd3800 Mon Sep 17 00:00:00 2001 From: Greg Taylor Date: Thu, 11 Dec 2008 16:53:04 +0000 Subject: [PATCH] Important change! Removed settings.py.dist and settings_common.py in favor of a local_settings.py file. This will make changes to the settings file much easier. You will need to create local_settings.py. Copy-paste any variables you'd like to change from settings.py to local_settings.py. Anything appearing in local_settings.py over-rides settings.py. For those that have been following the codebase and have a settings.py file of their own, you'll need to either delete it or move it to a file name other than settings.py so that the new default settings.py file from the repository may be downloaded. --- settings.py.dist => settings.py | 70 ++++++++++++++++++++++++++++++--- settings_common.py | 50 ----------------------- 2 files changed, 64 insertions(+), 56 deletions(-) rename settings.py.dist => settings.py (65%) delete mode 100644 settings_common.py diff --git a/settings.py.dist b/settings.py similarity index 65% rename from settings.py.dist rename to settings.py index c2ddbaad0..b63ff1f44 100755 --- a/settings.py.dist +++ b/settings.py @@ -1,5 +1,13 @@ +""" +Master configuration file for Evennia. + +NOTE: NO MODIFICATIONS SHOULD BE MADE TO THIS FILE! All settings changes should +be done by copy-pasting the variable and its value to a new file (if it doesn't +already exist) called local_settings.py and changed there. Anything in the +local_settings.py file will override what is seen in settings.py by the +import at the end of this file. +""" import os -import settings_common # A list of ports to listen on. Can be one or many. GAMEPORTS = [4000] @@ -82,7 +90,7 @@ USE_I18N = False # you're running Django's built-in test server. Normally you want a webserver # that is optimized for serving static content to handle media files (apache, # lighttpd). -SERVE_MEDIA = False +SERVE_MEDIA = True # The master urlconf file that contains all of the sub-branches to the # applications. @@ -122,7 +130,57 @@ TEMPLATE_DIRS = ( "%s/webtemplates/%s" % (BASE_PATH, ACTIVE_TEMPLATE), ) -TEMPLATE_LOADERS = settings_common.TEMPLATE_LOADERS -MIDDLEWARE_CLASSES = settings_common.MIDDLEWARE_CLASSES -TEMPLATE_CONTEXT_PROCESSORS = settings_common.TEMPLATE_CONTEXT_PROCESSORS -INSTALLED_APPS = settings_common.INSTALLED_APPS +# List of callables that know how to import templates from various sources. +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.load_template_source', + 'django.template.loaders.app_directories.load_template_source', +) + +# MiddleWare are semi-transparent extensions to Django's functionality. +# see http://www.djangoproject.com/documentation/middleware/ for a more detailed +# explanation. +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.middleware.doc.XViewMiddleware', + 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', +) + +# Context processors define context variables, generally for the template +# system to use. +TEMPLATE_CONTEXT_PROCESSORS = ( + 'django.core.context_processors.i18n', + 'django.core.context_processors.request', + 'django.core.context_processors.auth', + 'django.core.context_processors.media', + 'django.core.context_processors.debug', + 'webapps.website.webcontext.general_context', +) + +# Global and Evennia-specific apps. This ties everything together so we can +# refer to app models and perform DB syncs. +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.sites', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.admin', + 'django.contrib.flatpages', + 'apps.config', + 'apps.objects', + 'apps.helpsys', + 'apps.genperms', + 'webapps.news', + 'webapps.website', +) + +""" +Importing everything from local_settings.py overrides the settings in this +file with the settings specified in local_settings.py. Any configuration +changes should happen in local_settings.py rather than this file. +""" +try: + from local_settings import * +except ImportError: + pass \ No newline at end of file diff --git a/settings_common.py b/settings_common.py deleted file mode 100644 index a41e5ca97..000000000 --- a/settings_common.py +++ /dev/null @@ -1,50 +0,0 @@ -""" -Common settings that don't change very much. This allows us to update things -like apps through subversion without developers having to modify their -settings.py file, which is not versioned. -""" - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.load_template_source', - 'django.template.loaders.app_directories.load_template_source', -) - -# Context processors define context variables, generally for the template -# system to use. -TEMPLATE_CONTEXT_PROCESSORS = ( - 'django.core.context_processors.i18n', - 'django.core.context_processors.request', - 'django.core.context_processors.auth', - 'django.core.context_processors.media', - 'django.core.context_processors.debug', - 'webapps.website.webcontext.general_context', -) - -# MiddleWare are semi-transparent extensions to Django's functionality. -# see http://www.djangoproject.com/documentation/middleware/ for a more detailed -# explanation. -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.middleware.doc.XViewMiddleware', - 'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware', -) - -# Global and Evennia-specific apps. This ties everything together so we can -# refer to app models and perform DB syncs. -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.sites', - 'django.contrib.contenttypes', - 'django.contrib.sessions', - 'django.contrib.admin', - 'django.contrib.flatpages', - 'apps.config', - 'apps.objects', - 'apps.helpsys', - 'apps.genperms', - 'webapps.news', - 'webapps.website', -)