[ARVADOS] updated: 062a8bf0f9a1fe762c16749e7d0bcea77d1fbd73

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/config/application.yml.example | 2 +-
 services/api/config/application.default.yml   | 2 --
 services/api/config/application.yml.example   | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

       via  062a8bf0f9a1fe762c16749e7d0bcea77d1fbd73 (commit)
       via  ee4ac5896e121a73fbc1594e9c2611513f65e146 (commit)
       via  bcc6c7cb22b94c95c66721cc156bc8b8afbb86e9 (commit)
      from  7a8b20bd1613c22c7629aa84b0fff51b2434dcf7 (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 062a8bf0f9a1fe762c16749e7d0bcea77d1fbd73
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 24 21:47:43 2014 -0400

    3349: Do not override working "test" defaults in example config.

diff --git a/apps/workbench/config/application.yml.example b/apps/workbench/config/application.yml.example
index 395f1a9..f617af3 100644
--- a/apps/workbench/config/application.yml.example
+++ b/apps/workbench/config/application.yml.example
@@ -10,7 +10,7 @@
 # 4. Section in application.default.yml corresponding to RAILS_ENV
 # 5. Section in application.default.yml called "common"
 
-common:
+development:
   # At minimum, you need a nice long randomly generated secret_token here.
   secret_token: ~
 

commit ee4ac5896e121a73fbc1594e9c2611513f65e146
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 24 21:26:37 2014 -0400

    3349: Add default blob_signing_key for test environment.

diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index b6e8d93..09dd78c 100644
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -39,6 +39,7 @@ production:
 test:
   uuid_prefix: zzzzz
   secret_token: <%= rand(2**512).to_s(36) %>
+  blob_signing_key: <%= rand(2**512).to_s(36) %>
 
 common:
   #git_repositories_dir: /var/cache/git

commit bcc6c7cb22b94c95c66721cc156bc8b8afbb86e9
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 24 21:23:16 2014 -0400

    3349: Remove duplicate keys in default yml.

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index dc00e33..0d26804 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -42,8 +42,6 @@ test:
   uuid_prefix: zzzzz
 
 common:
-  secret_token: ~
-  blob_signing_key: ~
   uuid_prefix: <%= Digest::MD5.hexdigest(`hostname`).to_i(16).to_s(36)[0..4] %>
 
   # Git repositories must be readable by api server, or you won't be

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


hooks/post-receive
--