Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Clean up settings a bit. They're still a mess.

  • Loading branch information...
commit d3bd2810e9aea5c3a7a54a5497c36a40df0cf14b 1 parent da4decb
@aaugustin aaugustin authored
Showing with 12 additions and 10 deletions.
  1. +0 −1  django_docs/settings.py
  2. +12 −9 django_www/settings.py
View
1  django_docs/settings.py
@@ -1,7 +1,6 @@
from django_www.settings import *
PREPEND_WWW = False
-APPEND_SLASH = True
TEMPLATE_CONTEXT_PROCESSORS += ["django.core.context_processors.request"]
ROOT_URLCONF = 'django_docs.urls'
CACHE_MIDDLEWARE_KEY_PREFIX = 'djangodocs'
View
21 django_www/settings.py
@@ -14,14 +14,17 @@
# It's a secret to everybody
SECRETS = json.load(open(BASE.parent.child('secrets.json')))
SECRET_KEY = str(SECRETS['secret_key'])
-# SUPERFEEDR_CREDS is a 2 element list in the form of [email,secretkey]
-SUPERFEEDR_CREDS = SECRETS.get('superfeedr_creds')
-ADMINS = (('Adrian Holovaty','holovaty@gmail.com'),('Jacob Kaplan-Moss', 'jacob@jacobian.org'))
-MANAGERS = (('Jacob Kaplan-Moss','jacob@jacobian.org'),)
+ADMINS = (
+ ('Adrian Holovaty', 'holovaty@gmail.com'),
+ ('Jacob Kaplan-Moss', 'jacob@jacobian.org'),
+)
+MANAGERS = (
+ ('Jacob Kaplan-Moss', 'jacob@jacobian.org'),
+)
FEED_APPROVERS_GROUP_NAME = "feed-approver"
+
TIME_ZONE = 'America/Chicago'
-SERVER_EMAIL = 'root@djangoproject.com'
CACHES = {
'default': {
@@ -46,6 +49,7 @@
USE_I18N = False
USE_L10N = False
+USE_TZ = True
MEDIA_ROOT = BASE.child('media')
MEDIA_URL = '/m/'
@@ -113,10 +117,6 @@
MIDDLEWARE_CLASSES.insert(0, 'django.middleware.cache.UpdateCacheMiddleware')
MIDDLEWARE_CLASSES.append('django.middleware.cache.FetchFromCacheMiddleware')
-TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.Loader',
- 'django.template.loaders.app_directories.Loader',
-)
TEMPLATE_CONTEXT_PROCESSORS = [
"django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
@@ -127,6 +127,7 @@
]
DEFAULT_FROM_EMAIL = "noreply@djangoproject.com"
+SERVER_EMAIL = "root@djangoproject.com"
LOGGING = {
"version": 1,
@@ -190,6 +191,8 @@
PUSH_HUB = 'https://superfeedr.com/hubbub'
PUSH_CREDENTIALS = 'aggregator.utils.push_credentials'
PUSH_SSL_CALLBACK = PRODUCTION
+# SUPERFEEDR_CREDS is a 2 element list in the form of [email,secretkey]
+SUPERFEEDR_CREDS = SECRETS.get('superfeedr_creds')
# Lock down some security stuff
if PRODUCTION:
Please sign in to comment.
Something went wrong with that request. Please try again.