[ARVADOS] updated: c7301d8983252bffde9ab48514a033f0d4df7e7f

[git at public.curoverse.com]

Summary of changes:
 .../{load_config.rb => zz_load_config.rb}          |    0
 services/api/config/application.default.yml        |    1 +
 services/api/config/application.yml.example        |    4 ++++
 .../{load_config.rb => zz_load_config.rb}          |    0
 4 files changed, 5 insertions(+), 0 deletions(-)
 rename apps/workbench/config/initializers/{load_config.rb => zz_load_config.rb} (100%)
 rename services/api/config/initializers/{load_config.rb => zz_load_config.rb} (100%)

       via  c7301d8983252bffde9ab48514a033f0d4df7e7f (commit)
      from  b31cc1c673b03aec2a77b81a6bfc1da676a9dc69 (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 c7301d8983252bffde9ab48514a033f0d4df7e7f
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Mar 10 16:26:57 2014 -0400

    Rename load_config to zz_load_config so initializers/secret_token.rb
    gets loaded before we check for missing config settings.
    
    refs #2076

diff --git a/apps/workbench/config/initializers/load_config.rb b/apps/workbench/config/initializers/zz_load_config.rb
similarity index 100%
rename from apps/workbench/config/initializers/load_config.rb
rename to apps/workbench/config/initializers/zz_load_config.rb
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index c8ad012..36eedb4 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -41,6 +41,7 @@ test:
   active_record.mass_assignment_sanitizer: :strict
 
 common:
+  secret_token: ~
   uuid_prefix: <%= Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4] %>
 
   git_repositories_dir: /var/cache/git
diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index 3035c8b..dcfcb42 100644
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -13,6 +13,9 @@
 development:
 
 production:
+  # At minimum, you need a nice long randomly generated secret_token here.
+  secret_token: ~
+
   uuid_prefix: bogus
 
   # This is suitable for AWS; see common section below for a static example.
@@ -32,6 +35,7 @@ test:
   uuid_prefix: zzzzz
 
 common:
+  secret_token: ~
   compute_node_nameservers:
     - 192.168.0.1
     - 172.16.0.1
diff --git a/services/api/config/initializers/load_config.rb b/services/api/config/initializers/zz_load_config.rb
similarity index 100%
rename from services/api/config/initializers/load_config.rb
rename to services/api/config/initializers/zz_load_config.rb

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


hooks/post-receive
--