From 8c098891e29985a49a4069349ea56990d9a2c30b Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 14 Jul 2005 04:27:55 +0000 Subject: [PATCH] Removed World-Online-specific stuff from django.conf.global_settings git-svn-id: http://code.djangoproject.com/svn/django/trunk@11 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/global_settings.py | 159 +++++++++++---------------------- 1 file changed, 54 insertions(+), 105 deletions(-) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 4127bbdc4e..ebf6a46ceb 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -1,8 +1,6 @@ # Default Django settings. Override these with settings in the module # pointed-to by the DJANGO_SETTINGS_MODULE environment variable. -import re - #################### # CORE # #################### @@ -16,15 +14,10 @@ USE_ETAGS = False # In the format (('Full Name', 'email@domain.com'), ('Full Name', 'anotheremail@domain.com')) ADMINS = () -# These IP addresses: +# Tuple of IP addresses, as strings, that: # * See debug comments, when DEBUG is true # * Receive x-headers -INTERNAL_IPS = ( - '24.124.4.220', # World Online offices - '24.124.1.4', # https://admin.6newslawrence.com/ - '24.148.30.138', # Adrian home - '127.0.0.1', # localhost -) +INTERNAL_IPS = () # Local time zone for this installation. All choices can be found here: # http://www.postgresql.org/docs/current/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE @@ -39,64 +32,67 @@ LANGUAGE_CODE = 'en-us' # notifications and other various e-mails. MANAGERS = ADMINS -# which e-mail address error messages come from -SERVER_EMAIL = None +# E-mail address that error messages come from. +SERVER_EMAIL = 'root@localhost' -# Whether to send broken-link e-mails +# Whether to send broken-link e-mails. SEND_BROKEN_LINK_EMAILS = True -# postgres database connection info -DATABASE_ENGINE = 'postgresql' -DATABASE_NAME = 'cms' -DATABASE_USER = 'apache' +# Database connection info. +DATABASE_ENGINE = 'postgresql' # 'postgresql' or 'mysql' +DATABASE_NAME = '' +DATABASE_USER = '' DATABASE_PASSWORD = '' -DATABASE_HOST = '' # set to empty string for localhost +DATABASE_HOST = '' # Set to empty string for localhost -# host for sending e-mail +# Host for sending e-mail. EMAIL_HOST = 'localhost' -# name of the session cookie +# Name of the session cookie. This can be whatever you want. AUTH_SESSION_COOKIE = 'rizzo' -# name of the authorization profile module (below django.apps) -AUTH_PROFILE_MODULE = '' +# List of locations of the template source files, in search order. +TEMPLATE_DIRS = () -# list of locations of the template source files, in search order -TEMPLATE_DIRS = [] +# Default e-mail address to use for various automated correspondence from +# the site managers. +DEFAULT_FROM_EMAIL = 'webmaster@localhost' -# default e-mail address to use for various automated correspondence from the site managers -DEFAULT_FROM_EMAIL = 'webmaster@ljworld.com' - -# whether to append trailing slashes to URLs +# Whether to append trailing slashes to URLs. APPEND_SLASH = True -# whether to prepend the "www." subdomain to URLs +# Whether to prepend the "www." subdomain to URLs that don't have it. PREPEND_WWW = False -# list of regular expressions representing User-Agent strings that are not -# allowed to visit any page, CMS-wide. Use this for bad robots/crawlers. -DISALLOWED_USER_AGENTS = ( - re.compile(r'^NaverBot.*'), - re.compile(r'^EmailSiphon.*'), - re.compile(r'^SiteSucker.*'), - re.compile(r'^sohu-search') -) +# List of compiled regular expression objects representing User-Agent strings +# that are not allowed to visit any page, systemwide. Use this for bad +# robots/crawlers. Here are a few examples: +# import re +# DISALLOWED_USER_AGENTS = ( +# re.compile(r'^NaverBot.*'), +# re.compile(r'^EmailSiphon.*'), +# re.compile(r'^SiteSucker.*'), +# re.compile(r'^sohu-search') +# ) +DISALLOWED_USER_AGENTS = () ABSOLUTE_URL_OVERRIDES = {} -# list of allowed prefixes for the {% ssi %} tag -ALLOWED_INCLUDE_ROOTS = ('/home/html',) +# Tuple of strings representing allowed prefixes for the {% ssi %} tag. +# Example: ('/home/html', '/var/www') +ALLOWED_INCLUDE_ROOTS = () -# if this is a admin settings module, this should be a list of -# settings modules for which this admin is an admin for +# If this is a admin settings module, this should be a list of +# settings modules (in the format 'foo.bar.baz') for which this admin +# is an admin. ADMIN_FOR = [] -# 404s that may be ignored +# 404s that may be ignored. IGNORABLE_404_STARTS = ('/cgi-bin/', '/_vti_bin', '/_vti_inf') IGNORABLE_404_ENDS = ('mail.pl', 'mailform.pl', 'mail.cgi', 'mailform.cgi', 'favicon.ico', '.php') ############## -# Middleware # +# MIDDLEWARE # ############## # List of middleware classes to use. Order is important; in the request phase, @@ -112,23 +108,11 @@ MIDDLEWARE_CLASSES = ( ######### # The cache backend to use. See the docstring in django.core.cache for the -# values this can be set to. +# possible values. CACHE_BACKEND = 'simple://' -#################### -# REGISTRATION # -#################### - -# E-mail addresses at these domains cannot sign up for accounts -BANNED_EMAIL_DOMAINS = [ - 'mailinator.com', 'dodgeit.com', 'spamgourmet.com', 'mytrashmail.com' -] -REGISTRATION_COOKIE_DOMAIN = None # set to a string like ".lawrence.com", or None for standard domain cookie - -# If this is set to True, users will be required to fill out their profile -# (defined by AUTH_PROFILE_MODULE) before they will be allowed to create -# an account. -REGISTRATION_REQUIRES_PROFILE = False +# Set to a string like ".lawrence.com", or None for a standard domain cookie. +REGISTRATION_COOKIE_DOMAIN = None #################### # COMMENTS # @@ -138,63 +122,28 @@ COMMENTS_ALLOW_PROFANITIES = False # The group ID that designates which users are banned. # Set to None if you're not using it. -COMMENTS_BANNED_USERS_GROUP = 19 +COMMENTS_BANNED_USERS_GROUP = None # The group ID that designates which users can moderate comments. # Set to None if you're not using it. -COMMENTS_MODERATORS_GROUP = 20 +COMMENTS_MODERATORS_GROUP = None # The group ID that designates the users whose comments should be e-mailed to MANAGERS. # Set to None if you're not using it. -COMMENTS_SKETCHY_USERS_GROUP = 22 +COMMENTS_SKETCHY_USERS_GROUP = None # The system will e-mail MANAGERS the first COMMENTS_FIRST_FEW comments by each # user. Set this to 0 if you want to disable it. -COMMENTS_FIRST_FEW = 10 +COMMENTS_FIRST_FEW = 0 -BANNED_IPS = ( - # Dupont Stainmaster / GuessWho / a variety of other names (back when we had free comments) - '204.94.104.99', '66.142.59.23', '220.196.165.142', - # (Unknown) - '64.65.191.117', -# # Jimmy_Olsen / Clark_Kent / Bruce_Wayne -# # Unbanned on 2005-06-17, because other people want to register from this address. -# '12.106.111.10', - # hoof_hearted / hugh_Jass / Ferd_Burfel / fanny_farkel - '24.124.72.20', '170.135.241.46', - # Zac_McGraw - '198.74.20.74', '198.74.20.75', -) +# A tuple of IP addresses that have been banned from participating in various +# Django-powered features. +BANNED_IPS = () -#################### -# BLOGS # -#################### +# Absolute path to the directory that holds media. +# Example: "/home/media/media.lawrence.com/" +MEDIA_ROOT = '' -# E-mail addresses to notify when a new blog entry is posted live -BLOGS_EMAILS_TO_NOTIFY = [] - -#################### -# PLACES # -#################### - -# A list of IDs -- *as integers, not strings* -- that are considered the "main" -# cities served by this installation. Probably just one. -MAIN_CITY_IDS = (1,) # Lawrence - -# A list of IDs -- *as integers, not strings* -- that are considered "local" by -# this installation. -LOCAL_CITY_IDS = (1, 3) # Lawrence and Kansas City, MO - -#################### -# THUMBNAILS # -#################### - -THUMB_ALLOWED_WIDTHS = (90, 120, 180, 240, 450) - -#################### -# VARIOUS ROOTS # -#################### - -# This is the new media root and URL! Use it, and only it! -MEDIA_ROOT = '/home/media/media.lawrence.com/' -MEDIA_URL = 'http://media.lawrence.com' +# URL that handles the media served from MEDIA_ROOT. +# Example: "http://media.lawrence.com" +MEDIA_URL = ''