consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Make config.time_zone configurable at secrets.yml"

Browse Source
This commit is contained in:
Alberto Calderón Queimadelos
2018-03-08 17:03:38 +01:00
committed by Bertocq
parent 496d88b655
commit 0e1d5d95a7
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/application.rb
View File

@@ -32,7 +32,7 @@ module Consul
# Add lib to the autoload path # Add lib to the autoload path
config.autoload_paths << Rails.root.join('lib') config.autoload_paths << Rails.root.join('lib')
config.time_zone = Rails.application.secrets.time_zone config.time_zone = 'Madrid'
config.active_job.queue_adapter = :delayed_job config.active_job.queue_adapter = :delayed_job
# CONSUL specific custom overrides # CONSUL specific custom overrides

3
config/secrets.yml.example
View File

@@ -1,5 +1,4 @@
default: &default default: &default
time_zone: 'Madrid'
secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4 secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
maps: &maps maps: &maps
@@ -41,7 +40,6 @@ staging:
<<: *apis <<: *apis
preproduction: preproduction:
time_zone: 'Madrid'
secret_key_base: "" secret_key_base: ""
server_name: "" server_name: ""
rollbar_server_token: "" rollbar_server_token: ""
@@ -59,7 +57,6 @@ preproduction:
<<: *apis <<: *apis
production: production:
time_zone: 'Madrid'
secret_key_base: "" secret_key_base: ""
server_name: "" server_name: ""
rollbar_server_token: "" rollbar_server_token: ""