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

Merge pull request #5318 from consuldemocracy/application_timezone

Browse Source 
Allow to set the application timezone via secrets
This commit is contained in:
Senén Rodero
2024-01-19 16:16:47 +01:00
committed by GitHub
parent 614945a607 9646991846
commit d7a48280a9
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/application.rb
View File

@@ -51,7 +51,7 @@ module Consul
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. # 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. # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
config.time_zone = "Madrid" config.time_zone = Rails.application.secrets.time_zone.presence || "Madrid"
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # 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] # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]

5
config/secrets.yml.example
View File

@@ -16,6 +16,7 @@ http_basic_auth: &http_basic_auth
http_basic_auth: true http_basic_auth: true
development: development:
# time_zone: ""
http_basic_username: "dev" http_basic_username: "dev"
http_basic_password: "pass" http_basic_password: "pass"
authentication_logs: false authentication_logs: false
@@ -31,12 +32,14 @@ development:
<<: *maps <<: *maps
test: test:
# time_zone: ""
secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4 secret_key_base: 56792feef405a59b18ea7db57b4777e855103882b926413d4afdfb8c0ea8aa86ea6649da4e729c5f5ae324c0ab9338f789174cf48c544173bc18fdc3b14262e4
<<: *maps <<: *maps
staging: staging:
# secret_key_base: "" # secret_key_base: ""
server_name: "" server_name: ""
# time_zone: ""
# mailer_delivery_method: :smtp # mailer_delivery_method: :smtp
# smtp_settings: # smtp_settings:
# :address: "smtp.example.com" # :address: "smtp.example.com"
@@ -81,6 +84,7 @@ staging:
preproduction: preproduction:
# secret_key_base: "" # secret_key_base: ""
server_name: "" server_name: ""
# time_zone: ""
# mailer_delivery_method: :smtp # mailer_delivery_method: :smtp
# smtp_settings: # smtp_settings:
# :address: "smtp.example.com" # :address: "smtp.example.com"
@@ -131,6 +135,7 @@ preproduction:
production: production:
# secret_key_base: "" # secret_key_base: ""
server_name: "" server_name: ""
# time_zone: ""
# mailer_delivery_method: :smtp # mailer_delivery_method: :smtp
# smtp_settings: # smtp_settings:
# :address: "smtp.example.com" # :address: "smtp.example.com"