Add attribute for managing the django time zone setting

sous-chefs · Feb 1, 2013 · 92c4a90 · 92c4a90
1 parent ddbaa10
commit 92c4a90
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -22,6 +22,10 @@ The default password for graphite "root" user.
 
 * `node[:graphite][:password]`
 
+Set the timezone for the graphite web interface, defaults to America/Los_Angeles
+
+* `node[:graphite][:timezone]`
+
 Usage
 =====
 

diff --git a/attributes/graphite.rb b/attributes/graphite.rb
@@ -12,6 +12,7 @@
 default['graphite']['base_dir'] = "/opt/graphite"
 default['graphite']['doc_root'] = "/opt/graphite/webapp"
 default['graphite']['storage_dir'] = "/opt/graphite/storage"
+default['graphite']['timezone'] = "America/Los_Angeles"
 
 default['graphite']['whisper']['uri'] = "https://launchpad.net/graphite/0.9/#{node['graphite']['version']}/+download/whisper-#{node['graphite']['version']}.tar.gz"
 default['graphite']['whisper']['checksum'] = "36b5fa917526224678da0a530a6f276d00074f0aa98acd6e2412c79521f9c4ff"

diff --git a/templates/default/local_settings.py.erb b/templates/default/local_settings.py.erb
@@ -9,7 +9,7 @@
 # Set your local timezone (Django's default is America/Chicago)
 # If your graphs appear to be offset by a couple hours then this probably
 # needs to be explicitly set to your local timezone.
-#TIME_ZONE = 'America/Los_Angeles'
+TIME_ZONE = '<%= node['graphite']['timezone']  %>'
 
 # Override this to provide documentation specific to your Graphite deployment
 #DOCUMENTATION_URL = "http://graphite.readthedocs.org/"