New credential locations

Author: martaribeiro

.env.postgresql

@@ -42,7 +42,7 @@ ROLLBAR_ENV=
 # customized content in ./app/views/branded and `app` is for the core roadmap translations.
 # Include your Translation.io API key for the appropriate domains:
 #    app => TRANSLATION_API_ROADMAP
-#    client => TRANSLATION_API_CLIENT
-DOMAIN=app
-TRANSLATION_API_ROADMAP=
-TRANSLATION_API_CLIENT=
+# #    client => TRANSLATION_API_CLIENT
+# DOMAIN=app
+# TRANSLATION_API_ROADMAP=
+# TRANSLATION_API_CLIENT=

config/credentials.yml.sample

@@ -0,0 +1,28 @@
+# aws:
+#   access_key_id: 123
+#   secret_access_key: 345
+
+# Recaptcha credentials
+recaptcha:
+  site_key: "11111"
+  secret_key: "22222"
+
+# Database details
+database:
+    user_name: roadmap
+    password: password123
+
+# Dragonfly gem
+dragonfly_secret: "my_dragonfly_secret"
+
+# Devise credentials
+secret_key: "11111122222"
+devise_pepper: "111122223333444455555"
+
+# Translation.io API key
+translation_api_key: "111112222333334444"
+
+translation_api_client_key: "Client key if present"
+
+# Used as the base secret for all MessageVerifiers in Rails, including the one protecting cookies.
+secret_key_base: "1111111111111222222223333333444444"

config/database.yml.sample

@@ -5,11 +5,11 @@ defaults: &defaults
   host: <%= ENV.fetch('DB_HOST', 'localhost') %>
   port: <%= ENV.fetch('DB_PORT', '5432') %>
   database: <%= ENV.fetch('DB_NAME', 'roadmap') %>
-  username: <%= ENV.fetch('DB_USERNAME', Rails.application.credentials.db_username) %>
-  password: <%= ENV.fetch('DB_PASSWORD', Rails.application.credentials.db_password) %>
+  username: <%= Rails.application.credentials.dig(:database, :username) %>
+  password: <%= Rails.application.credentials.dig(:database, :password) %>
 
 development:
   <<: *defaults
 
-staging:
+test:
   <<: *defaults

config/initializers/translation.rb

@@ -21,7 +21,7 @@
 # domain specified in order to generate both sets of translation keys.
 if !ENV['DOMAIN'] || ENV['DOMAIN'] == 'app'
   TranslationIO.configure do |config|
-    config.api_key              = ENV.fetch('TRANSLATION_API_ROADMAP', nil)
+    config.api_key              = Rails.application.credentials.dig(:translation_api_key).presence
     config.source_locale        = 'en'
     config.target_locales       = SUPPORTED_LOCALES
     config.text_domain          = 'app'
@@ -31,7 +31,7 @@
   end
 elsif ENV['DOMAIN'] == 'client'
   TranslationIO.configure do |config|
-    config.api_key              = ENV.fetch('TRANSLATION_API_CLIENT', nil)
+    config.api_key              = Rails.application.credentials.dig(:translation_api_client_key).presence
     config.source_locale        = 'en'
     config.target_locales       = CLIENT_LOCALES
     config.text_domain          = 'client'