Rename config[.defaults].yml to application[.default].yml

diff --git a/apps/workbench/.gitignore b/apps/workbench/.gitignore
index 1c551bc901fbde5ddc5d9d368edf7a67104d7c48..a656a5bc61f6dc05b29b840c25084fbfe62a375f 100644 (file)
--- a/apps/workbench/.gitignore
+++ b/apps/workbench/.gitignore
@@ -22,7 +22,7 @@
 /config/environments/development.rb
 /config/environments/test.rb
 /config/environments/production.rb
-/config/config.yml
+/config/application.yml
 
 /config/piwik.yml
 

diff --git a/apps/workbench/config/config.defaults.yml b/apps/workbench/config/application.default.yml
similarity index 97%
rename from apps/workbench/config/config.defaults.yml
rename to apps/workbench/config/application.default.yml
index 939494345617498fffd7a3a25c2dc9ffd6ad3020..790c1f79fd2390de2a86f67916daf03f19a5a345 100644 (file)
--- a/apps/workbench/config/config.defaults.yml
+++ b/apps/workbench/config/application.default.yml
@@ -1,5 +1,5 @@
 # Do not use this file for site configuration. Create config.yml
-# instead (see config.yml.example).
+# instead (see application.yml.example).
 
 development:
   cache_classes: false

diff --git a/apps/workbench/config/config.yml.example b/apps/workbench/config/application.yml.example
similarity index 51%
rename from apps/workbench/config/config.yml.example
rename to apps/workbench/config/application.yml.example
index 45c8a2833493b45cbc88fbf10e8c8e940ccac036..395f1a94bd470e540b4c69fcb4c32c97896a6526 100644 (file)
--- a/apps/workbench/config/config.yml.example
+++ b/apps/workbench/config/application.yml.example
@@ -1,14 +1,14 @@
-# Copy this file to config.yml and edit to suit.
+# Copy this file to application.yml and edit to suit.
 #
-# Consult config.defaults.yml for the full list of configuration
+# Consult application.default.yml for the full list of configuration
 # settings.
 #
 # The order of precedence is:
 # 1. config/environments/{RAILS_ENV}.rb (deprecated)
-# 2. Section in config.yml corresponding to RAILS_ENV (e.g., development)
-# 3. Section in config.yml called "common"
-# 4. Section in config.defaults.yml corresponding to RAILS_ENV
-# 5. Section in config.defaults.yml called "common"
+# 2. Section in application.yml corresponding to RAILS_ENV (e.g., development)
+# 3. Section in application.yml called "common"
+# 4. Section in application.default.yml corresponding to RAILS_ENV
+# 5. Section in application.default.yml called "common"
 
 common:
   # At minimum, you need a nice long randomly generated secret_token here.

diff --git a/apps/workbench/config/initializers/load_config.rb b/apps/workbench/config/initializers/load_config.rb
index 90ddbde9d7c0025e21b396919fd242e5ac753169..43711fc7d52df89694f774030a7b800f525b032e 100644 (file)
--- a/apps/workbench/config/initializers/load_config.rb
+++ b/apps/workbench/config/initializers/load_config.rb
@@ -1,5 +1,6 @@
 $application_config = {}
-%w(config.defaults config).each do |cfgfile|
+
+%w(application.default application).each do |cfgfile|
   path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
   if File.exists? path
     yaml = ERB.new(IO.read path).result(binding)
@@ -36,7 +37,8 @@ ArvadosWorkbench::Application.configure do
     raise <<EOS
 Refusing to start in #{::Rails.env.to_s} mode with missing configuration.
 
-The following configuration settings must be specified in config/config.yml:
+The following configuration settings must be specified in
+config/application.yml:
 * #{nils.join "\n* "}
 
 EOS

diff --git a/services/api/.gitignore b/services/api/.gitignore
index 0e95cf8661c1c00d49935a80e7a685dc4300eddd..6ddf5231ced091461771a94999948f521136ad55 100644 (file)
--- a/services/api/.gitignore
+++ b/services/api/.gitignore
@@ -18,7 +18,7 @@
 /config/api.clinicalfuture.com.*
 /config/database.yml
 /config/initializers/omniauth.rb
-/config/config.yml
+/config/application.yml
 
 # asset cache
 /public/assets/

diff --git a/services/api/config/config.defaults.yml b/services/api/config/application.default.yml
similarity index 95%
rename from services/api/config/config.defaults.yml
rename to services/api/config/application.default.yml
index 8b454eab6271fb8bd79d0e2964bf82884caf5a86..c8ad012d68e77fa315a55b6c7f09d0cb242037aa 100644 (file)
--- a/services/api/config/config.defaults.yml
+++ b/services/api/config/application.default.yml
@@ -1,5 +1,5 @@
-# Do not use this file for site configuration. Create config.yml
-# instead (see config.yml.example).
+# Do not use this file for site configuration. Create application.yml
+# instead (see application.yml.example).
 
 development:
   force_ssl: false

diff --git a/services/api/config/config.yml.example b/services/api/config/application.yml.example
similarity index 66%
rename from services/api/config/config.yml.example
rename to services/api/config/application.yml.example
index 15f2be32ff89c0c88e00d73ac7f8affb3797c58c..3035c8ba04986bd1f3cd0363f9407af889bbf01c 100644 (file)
--- a/services/api/config/config.yml.example
+++ b/services/api/config/application.yml.example
@@ -1,14 +1,14 @@
-# Copy this file to config.yml and edit to suit.
+# Copy this file to application.yml and edit to suit.
 #
-# Consult config.defaults.yml for the full list of configuration
+# Consult application.default.yml for the full list of configuration
 # settings.
 #
 # The order of precedence is:
 # 1. config/environments/{RAILS_ENV}.rb (deprecated)
-# 2. Section in config.yml corresponding to RAILS_ENV (e.g., development)
-# 3. Section in config.yml called "common"
-# 4. Section in config.defaults.yml corresponding to RAILS_ENV
-# 5. Section in config.defaults.yml called "common"
+# 2. Section in application.yml corresponding to RAILS_ENV (e.g., development)
+# 3. Section in application.yml called "common"
+# 4. Section in application.default.yml corresponding to RAILS_ENV
+# 5. Section in application.default.yml called "common"
 
 development:
 

diff --git a/services/api/config/initializers/load_config.rb b/services/api/config/initializers/load_config.rb
index 954ab48dbcc55e7e2873956a283a6a690d315a58..3399fd9bf59fb9751303830cbb87aee89a502e81 100644 (file)
--- a/services/api/config/initializers/load_config.rb
+++ b/services/api/config/initializers/load_config.rb
@@ -1,6 +1,6 @@
 $application_config = {}
 
-%w(config.defaults config).each do |cfgfile|
+%w(application.default application).each do |cfgfile|
   path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
   if File.exists? path
     yaml = ERB.new(IO.read path).result(binding)
@@ -37,7 +37,8 @@ Server::Application.configure do
     raise <<EOS
 Refusing to start in #{::Rails.env.to_s} mode with missing configuration.
 
-The following configuration settings must be specified in config/config.yml:
+The following configuration settings must be specified in
+config/application.yml:
 * #{nils.join "\n* "}
 
 EOS