From c3fc38d2e2798c49290afac6feddb85c6dc9f656 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Tue, 16 Jun 2015 13:26:30 +0300
Subject: [PATCH] time_zone config added to application.yml #2488

---
 CHANGELOG.md                        | 4 ++++
 config/application-example.yml      | 1 +
 config/application.rb               | 3 ++-
 config/initializers/env_required.rb | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a5efa0b1..1e392ea1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+16.06.2015
+
+* Application time_zone should be defined at application.yml, updated application-exaple.yml 
+
 15.06.2015
 
 * Apache config update: now only TLSv1.2 allowed with whitelisted chipers, please review all SSL config parameters
diff --git a/config/application-example.yml b/config/application-example.yml
index fd9e957b7..5703337ce 100644
--- a/config/application-example.yml
+++ b/config/application-example.yml
@@ -4,6 +4,7 @@ app_name: '.EE Registry'
 zonefile_export_dir: 'export/zonefiles'
 bank_statement_import_dir: 'import/bank_statements'
 legal_documents_dir: 'import/legal_documents'
+time_zone: 'Tallinn' # more zones by rake time:zones:all  
 
 # New Relic app name, keep only current mode, remove other names.
 # Example: 'Admin, EPP, REPP' will have name 'Admin, EPP, REPP - production' at New Relic.
diff --git a/config/application.rb b/config/application.rb
index 233ddfb18..9931ce25e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -21,7 +21,8 @@ module Registry
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    config.time_zone = 'UTC' # NB! It should be defined, otherwise ActiveRecord usese other class.
+    config.time_zone = ENV['time_zone']  # NB! It should be defined, 
+                                         # otherwise ActiveRecord usese other class internally.
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
diff --git a/config/initializers/env_required.rb b/config/initializers/env_required.rb
index 3df22e811..d5921a161 100644
--- a/config/initializers/env_required.rb
+++ b/config/initializers/env_required.rb
@@ -10,6 +10,7 @@ required = %w(
   webclient_ip
   legal_documents_dir
   bank_statement_import_dir
+  time_zone
 )
 
 Figaro.require_keys(required)