From d22a359a18d4ff0e31cb96293f03687e5db719ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Mon, 23 Dec 2013 18:54:39 +0100
Subject: Do not store production information in .yml files

Instead, read information from environment variables.
---
 .../rails/app/templates/config/databases/frontbase.yml         |  6 +++---
 .../generators/rails/app/templates/config/databases/ibm_db.yml |  6 +++---
 .../generators/rails/app/templates/config/databases/jdbc.yml   |  6 +++---
 .../rails/app/templates/config/databases/jdbcmysql.yml         |  6 +++---
 .../rails/app/templates/config/databases/jdbcpostgresql.yml    |  6 +++---
 .../rails/app/templates/config/databases/jdbcsqlite3.yml       |  6 +++---
 .../generators/rails/app/templates/config/databases/mysql.yml  |  6 +++---
 .../generators/rails/app/templates/config/databases/oracle.yml |  6 +++---
 .../rails/app/templates/config/databases/postgresql.yml        |  6 +++---
 .../rails/app/templates/config/databases/sqlite3.yml           |  6 +++---
 .../rails/app/templates/config/databases/sqlserver.yml         |  6 +++---
 .../rails/generators/rails/app/templates/config/secrets.yml    | 10 +++-------
 12 files changed, 36 insertions(+), 40 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
index c6dfd50d40..36cc56cb23 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
@@ -23,6 +23,6 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-production:
-  <<: *default
-  database: <%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
index fe53cd0ea2..d67f10cbc5 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
@@ -61,6 +61,6 @@ test:
   <<: *default
   database: <%= app_name[0,4] %>_tst
 
-production:
-  <<: *default
-  database: <%= app_name[0,8] %>
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
index be1dae332f..286eeee24e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
@@ -53,6 +53,6 @@ test:
   <<: *default
   url: jdbc:db://localhost/<%= app_name %>_test
 
-production:
-  <<: *default
-  url: jdbc:db://localhost/<%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
index 26e2a5976c..d31761349c 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
@@ -26,6 +26,6 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-production:
-  <<: *default
-  database: <%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
index 2776ba477f..5127195710 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
@@ -42,6 +42,6 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-production:
-  <<: *default
-  database: <%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
index 28c36eb82f..b0ebd3f302 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
@@ -18,6 +18,6 @@ test:
   <<: *default
   database: db/test.sqlite3
 
-production:
-  <<: *default
-  database: db/production.sqlite3
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
index 3fc7ce28a1..86268b30c9 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
@@ -32,6 +32,6 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-production:
-  <<: *default
-  database: <%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
index d5b52c969b..3fe24dda35 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
@@ -32,6 +32,6 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-production:
-  <<: *default
-  database: <%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
index bdf53726c0..218b9ee480 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
@@ -59,6 +59,6 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-production:
-  <<: *default
-  database: <%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
index 1c1a37ca8d..5576fb9f6a 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
@@ -20,6 +20,6 @@ test:
   <<: *default
   database: db/test.sqlite3
 
-production:
-  <<: *default
-  database: db/production.sqlite3
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
index 4855f66c0d..2e3f5d1a0e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
@@ -42,6 +42,6 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-production:
-  <<: *default
-  database: <%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
index b32e4bf2a6..d9a245e32d 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
@@ -16,11 +16,7 @@ development:
 test:
   secret_key_base: <%= app_secret %>
 
-# This YAML file is processed by ERB first (as others). In particular the
-# production environment can set the secret via an environment variable
-# this way:
-#
-#   secret_key_base: <%%= ENV['SECRET_KEY_BASE'] %>
-#
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
 production:
-  secret_key_base: <%= app_secret %>
+  secret_key_base: <%%= ENV['SECRET_KEY_BASE'] %>
-- 
cgit v1.2.3


From facf2b47a46fae6aa18a6b1a5f6d2dff8714e3e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Mon, 23 Dec 2013 20:27:15 +0100
Subject: Add examples and namespace ENV options with "RAILS_"

---
 .../generators/rails/app/templates/config/databases/frontbase.yml | 2 +-
 .../generators/rails/app/templates/config/databases/ibm_db.yml    | 2 +-
 .../generators/rails/app/templates/config/databases/jdbc.yml      | 2 +-
 .../generators/rails/app/templates/config/databases/jdbcmysql.yml | 2 +-
 .../rails/app/templates/config/databases/jdbcpostgresql.yml       | 2 +-
 .../rails/app/templates/config/databases/jdbcsqlite3.yml          | 2 +-
 .../generators/rails/app/templates/config/databases/mysql.yml     | 8 ++++++--
 .../generators/rails/app/templates/config/databases/oracle.yml    | 2 +-
 .../rails/app/templates/config/databases/postgresql.yml           | 6 +++++-
 .../generators/rails/app/templates/config/databases/sqlite3.yml   | 6 +++++-
 .../generators/rails/app/templates/config/databases/sqlserver.yml | 2 +-
 .../lib/rails/generators/rails/app/templates/config/secrets.yml   | 2 +-
 12 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
index 36cc56cb23..334d2ba51c 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
@@ -25,4 +25,4 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
index d67f10cbc5..0a2dc1b19e 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
@@ -63,4 +63,4 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
index 286eeee24e..cda6bcab06 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
@@ -55,4 +55,4 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
index d31761349c..b316b3ade1 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
@@ -28,4 +28,4 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
index 5127195710..d76632f0ac 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
@@ -44,4 +44,4 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
index b0ebd3f302..4aaa97b104 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
@@ -20,4 +20,4 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
index 86268b30c9..28a5418b49 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/mysql.yml
@@ -32,6 +32,10 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-# Do not keep production credentials in the repository,
+# Avoid production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+#
+# Example:
+#   mysql2://myuser:mypass@localhost/somedatabase
+#
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
index 3fe24dda35..31abbe8ba6 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/oracle.yml
@@ -34,4 +34,4 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
index 218b9ee480..7a7a8c08e0 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
@@ -61,4 +61,8 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+#
+# Example:
+#   postgres://myuser:mypass@localhost/somedatabase
+#
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
index 5576fb9f6a..d8b0b61e14 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlite3.yml
@@ -22,4 +22,8 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+#
+# Example:
+#   sqlite3://myuser:mypass@localhost/somedatabase
+#
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
index 2e3f5d1a0e..c270497879 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/sqlserver.yml
@@ -44,4 +44,4 @@ test:
 
 # Do not keep production credentials in the repository,
 # instead read the configuration from the environment.
-production: <%%= ENV["DATABASE_URL"] %>
+production: <%%= ENV["RAILS_DATABASE_URL"] %>
diff --git a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
index d9a245e32d..6e2c45e119 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/secrets.yml
@@ -19,4 +19,4 @@ test:
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
-  secret_key_base: <%%= ENV['SECRET_KEY_BASE'] %>
+  secret_key_base: <%%= ENV["RAILS_SECRET_KEY_BASE"] %>
-- 
cgit v1.2.3


From f6e363309a6cffacd6087f3a901c562265c3b2ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Mon, 23 Dec 2013 20:32:44 +0100
Subject: Use the new Resolver API in dbconsole

---
 railties/lib/rails/commands/dbconsole.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'railties')

diff --git a/railties/lib/rails/commands/dbconsole.rb b/railties/lib/rails/commands/dbconsole.rb
index 847447fdad..09ee74ccae 100644
--- a/railties/lib/rails/commands/dbconsole.rb
+++ b/railties/lib/rails/commands/dbconsole.rb
@@ -83,9 +83,8 @@ module Rails
       @config ||= begin
         require APP_PATH
         ActiveRecord::ConnectionAdapters::ConnectionSpecification::Resolver.new(
-          ENV['DATABASE_URL'],
-          (Rails.application.config.database_configuration || {})
-        ).spec.config.stringify_keys
+          Rails.application.config.database_configuration || {}
+        ).resolve(ENV["DATABASE_URL"]).config.stringify_keys
       end
     end
 
-- 
cgit v1.2.3


From 2d4cfb28408f53daea11f45fb5e0aebdce8963d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@plataformatec.com.br>
Date: Mon, 23 Dec 2013 20:34:11 +0100
Subject: Update CHANGELOG [ci skip]

---
 railties/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'railties')

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index aa26017bda..a83c2b2355 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,8 @@
+*   Configure `secrets.yml` and `database.yml` to read configuration
+    from the system environment by default for production.
+
+    *José Valim*
+
 *   `config.assets.raise_runtime_errors` is set to true by default
 
     This option has been introduced in
-- 
cgit v1.2.3