aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2012-06-28 00:18:44 +0000
committerMichael Elkins <melkins@tislabs.com>2012-06-28 00:18:44 +0000
commitdf9abaa0903bef3567e1e1ad40fcfaa3d8e04298 (patch)
treed1dcf6af9a46c442bb0cd0c32f2331f09081631f
parent9c2f8553aab45659add80f0e77e0845990f1e464 (diff)
change default TIME_ZONE to UTC from GMT, since the former is the preferred name and appears to be present on all modern systems.
svn path=/trunk/; revision=4562
-rw-r--r--rpkid/portal-gui/settings.py.in16
1 files changed, 9 insertions, 7 deletions
diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in
index 186f3f1d..30cc19a8 100644
--- a/rpkid/portal-gui/settings.py.in
+++ b/rpkid/portal-gui/settings.py.in
@@ -1,4 +1,3 @@
-# $Id$
#
# Sample Django settings.py for running the RPKI portal gui. This
# template was written for Django 1.2.
@@ -6,6 +5,9 @@
# DO NOT EDIT! This file is automatically generated from
# settings.py.in
+
+__version__ = '$Id$'
+
import rpki.config
DEBUG = True
@@ -19,10 +21,10 @@ rpki.config.default_dirname = '%(AC_SYSCONFDIR)s'
rpki_config = rpki.config.parser(section='web_portal')
DATABASES = {
- 'default' : {
- 'ENGINE' : 'django.db.backends.mysql',
- 'NAME' : rpki_config.get('sql-database'),
- 'USER' : rpki_config.get('sql-username'),
+ 'default': {
+ 'ENGINE': 'django.db.backends.mysql',
+ 'NAME': rpki_config.get('sql-database'),
+ 'USER': rpki_config.get('sql-username'),
'PASSWORD': rpki_config.get('sql-password'),
# Ensure the default storage engine is InnoDB since we need
@@ -30,7 +32,7 @@ DATABASES = {
# removing this after the syncdb is performed as an optimization,
# but there isn't an easy way to do this automatically.
- 'OPTIONS' : {
+ 'OPTIONS': {
'init_command': 'SET storage_engine=INNODB'
}
}
@@ -41,7 +43,7 @@ DATABASES = {
# although not all choices may be available on all operating systems.
# If running in a Windows environment this must be set to the same as your
# system time zone.
-TIME_ZONE = 'GMT'
+TIME_ZONE = 'UTC'
# Make this unique, and don't share it with anybody.
SECRET_KEY = '%(AC_SECRET_KEY)s'