[ARVADOS] updated: 551fad0465af5ee41b091d3ea76f7c2ade1a4386

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/initializers/load_config.rb |    8 ++++----
 apps/workbench/lib/tasks/config_check.rake        |    8 ++++++++
 services/api/config/config.defaults.yml           |    2 +-
 services/api/config/initializers/load_config.rb   |    9 +++++----
 services/api/lib/tasks/config_check.rake          |    8 ++++++++
 5 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 apps/workbench/lib/tasks/config_check.rake
 create mode 100644 services/api/lib/tasks/config_check.rake

       via  551fad0465af5ee41b091d3ea76f7c2ade1a4386 (commit)
      from  74aa6539fccff9b135f3edec58801976b9a51538 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 551fad0465af5ee41b091d3ea76f7c2ade1a4386
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Mar 5 14:46:09 2014 -0500

    Add "rake config:check" task. refs #2076

diff --git a/apps/workbench/config/initializers/load_config.rb b/apps/workbench/config/initializers/load_config.rb
index 7f2b1cc..90ddbde 100644
--- a/apps/workbench/config/initializers/load_config.rb
+++ b/apps/workbench/config/initializers/load_config.rb
@@ -1,17 +1,17 @@
-conf = {}
+$application_config = {}
 %w(config.defaults config).each do |cfgfile|
   path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
   if File.exists? path
     yaml = ERB.new(IO.read path).result(binding)
     confs = YAML.load(yaml)
-    conf.merge!(confs['common'] || {})
-    conf.merge!(confs[::Rails.env.to_s] || {})
+    $application_config.merge!(confs['common'] || {})
+    $application_config.merge!(confs[::Rails.env.to_s] || {})
   end
 end
 
 ArvadosWorkbench::Application.configure do
   nils = []
-  conf.each do |k, v|
+  $application_config.each do |k, v|
     # "foo.bar: baz" --> { config.foo.bar = baz }
     cfg = config
     ks = k.split '.'
diff --git a/apps/workbench/lib/tasks/config_check.rake b/apps/workbench/lib/tasks/config_check.rake
new file mode 100644
index 0000000..c9f12fc
--- /dev/null
+++ b/apps/workbench/lib/tasks/config_check.rake
@@ -0,0 +1,8 @@
+namespace :config do
+  desc 'Ensure site configuration has all required settings'
+  task check: :environment do
+    $application_config.sort.each do |k, v|
+      $stderr.puts "%-32s %s" % [k, eval("Rails.configuration.#{k}")]
+    end
+  end
+end
diff --git a/services/api/config/config.defaults.yml b/services/api/config/config.defaults.yml
index d474988..8b454ea 100644
--- a/services/api/config/config.defaults.yml
+++ b/services/api/config/config.defaults.yml
@@ -63,7 +63,7 @@ common:
   compute_node_ec2run_args: -g arvados-compute
   compute_node_spot_bid: 0.11
 
-  compute_node_domain: <%= `hostname --domain`.strip %>
+  compute_node_domain: <%= `hostname`.split('.')[1..-1].join('.').strip %>
   compute_node_nameservers:
     - 192.168.1.1
   compute_node_ec2_tag_enable: false
diff --git a/services/api/config/initializers/load_config.rb b/services/api/config/initializers/load_config.rb
index f56bb2d..954ab48 100644
--- a/services/api/config/initializers/load_config.rb
+++ b/services/api/config/initializers/load_config.rb
@@ -1,17 +1,18 @@
-conf = {}
+$application_config = {}
+
 %w(config.defaults config).each do |cfgfile|
   path = "#{::Rails.root.to_s}/config/#{cfgfile}.yml"
   if File.exists? path
     yaml = ERB.new(IO.read path).result(binding)
     confs = YAML.load(yaml)
-    conf.merge!(confs['common'] || {})
-    conf.merge!(confs[::Rails.env.to_s] || {})
+    $application_config.merge!(confs['common'] || {})
+    $application_config.merge!(confs[::Rails.env.to_s] || {})
   end
 end
 
 Server::Application.configure do
   nils = []
-  conf.each do |k, v|
+  $application_config.each do |k, v|
     # "foo.bar: baz" --> { config.foo.bar = baz }
     cfg = config
     ks = k.split '.'
diff --git a/services/api/lib/tasks/config_check.rake b/services/api/lib/tasks/config_check.rake
new file mode 100644
index 0000000..c9f12fc
--- /dev/null
+++ b/services/api/lib/tasks/config_check.rake
@@ -0,0 +1,8 @@
+namespace :config do
+  desc 'Ensure site configuration has all required settings'
+  task check: :environment do
+    $application_config.sort.each do |k, v|
+      $stderr.puts "%-32s %s" % [k, eval("Rails.configuration.#{k}")]
+    end
+  end
+end

-----------------------------------------------------------------------


hooks/post-receive
--