diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-01-14 21:03:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-14 21:03:53 +0100 |
commit | 54d4a518d9a8079c9bc03bee454e966e93036942 (patch) | |
tree | ac44003e7cf1b3cb3fdcb3f648d32172bb2cbb8f /railties/lib/rails/application | |
parent | 2585e66b551a8b368425aad062e5f325985ab482 (diff) | |
parent | 37c948ce6715df8ecbcda2b64a1e6eee9c5d6bb6 (diff) | |
download | rails-54d4a518d9a8079c9bc03bee454e966e93036942.tar.gz rails-54d4a518d9a8079c9bc03bee454e966e93036942.tar.bz2 rails-54d4a518d9a8079c9bc03bee454e966e93036942.zip |
Merge pull request #33962 from kaspth/restructure-environment-credentials
Restructure credentials after environment overrides.
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r-- | railties/lib/rails/application/configuration.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 3595f60bf8..c2403c57a7 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -293,25 +293,25 @@ module Rails end private - def credentials_available_for_current_env? - File.exist?("#{root}/config/credentials/#{Rails.env}.yml.enc") - end - def default_credentials_content_path if credentials_available_for_current_env? - File.join(root, "config", "credentials", "#{Rails.env}.yml.enc") + root.join("config", "credentials", "#{Rails.env}.yml.enc") else - File.join(root, "config", "credentials.yml.enc") + root.join("config", "credentials.yml.enc") end end def default_credentials_key_path if credentials_available_for_current_env? - File.join(root, "config", "credentials", "#{Rails.env}.key") + root.join("config", "credentials", "#{Rails.env}.key") else - File.join(root, "config", "master.key") + root.join("config", "master.key") end end + + def credentials_available_for_current_env? + File.exist?(root.join("config", "credentials", "#{Rails.env}.yml.enc")) + end end end end |