diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2010-10-28 14:37:08 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2010-11-02 20:35:19 -0500 |
| commit | 40d3006505ea03cb2318622dff16eb7c2e8f7213 (patch) | |
| tree | a83dc88554c224d3c1ee95c5cb3601b421e6697a | |
| parent | 3e55068024caf55f0ed287e878c22aa71ff5ecfd (diff) | |
| download | bcfg2-40d3006505ea03cb2318622dff16eb7c2e8f7213.tar.gz bcfg2-40d3006505ea03cb2318622dff16eb7c2e8f7213.tar.bz2 bcfg2-40d3006505ea03cb2318622dff16eb7c2e8f7213.zip | |
Reports: Fix default time zone settings (Resolves Ticket #957)
We were previously defaulting to America/Chicago instead of leaving this
option up to the user. Setting the default to None will cause Django to
go by the system time.
Note also that Django sets the os.environ['TZ'] variable when this is
not none, so we want to be careful not to set that if we don't have to.
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | man/bcfg2.conf.5 | 5 | ||||
| -rw-r--r-- | src/lib/Server/Hostbase/settings.py | 7 | ||||
| -rw-r--r-- | src/lib/Server/Reports/settings.py | 2 |
3 files changed, 11 insertions, 3 deletions
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index 394bb347d..f2e47b7ac 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -325,6 +325,11 @@ Host for database connections. Not used for sqlite3. .B database_port Port for database connections. Not used for sqlite3. +.TP +.B time_zone +Specify a time zone other than that used on the system. (Note that this +will cause the bcfg2 server to log messages in this time zone as well). + .SH COMMUNICATION OPTIONS Specified in the [communication] section. These options define diff --git a/src/lib/Server/Hostbase/settings.py b/src/lib/Server/Hostbase/settings.py index dadf98d24..a42fd5b2e 100644 --- a/src/lib/Server/Hostbase/settings.py +++ b/src/lib/Server/Hostbase/settings.py @@ -44,8 +44,11 @@ DATABASE_HOST = options['database_host'] # Set to empty string for default. Not used with sqlite3. DATABASE_PORT = int(options['database_port']) # 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 -TIME_ZONE = 'America/Chicago' +# http://docs.djangoproject.com/en/dev/ref/settings/#time-zone +try: + TIME_ZONE = c.get('statistics', 'time_zone') +except: + TIME_ZONE = None # enter the defauly MX record machines will get in Hostbase # this setting may move elsewhere eventually diff --git a/src/lib/Server/Reports/settings.py b/src/lib/Server/Reports/settings.py index 81220c0e3..b725783ca 100644 --- a/src/lib/Server/Reports/settings.py +++ b/src/lib/Server/Reports/settings.py @@ -49,7 +49,7 @@ if DATABASE_ENGINE == 'sqlite3' and DATABASE_NAME == '': try: TIME_ZONE = c.get('statistics', 'time_zone') except: - TIME_ZONE = 'America/Chicago' + TIME_ZONE = None # Language code for this installation. All choices can be found here: # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes |