[ARVADOS] updated: 1.3.0-755-g3d878236c

[Git user]

Summary of changes:
 services/api/config/arvados_config.rb |  2 +-
 services/api/config/secrets.yml       | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 services/api/config/secrets.yml

       via  3d878236c48e4856b5f58fdc2e6d35f8193e6150 (commit)
      from  3c87946740b83f612561f998f7d83586593be830 (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 3d878236c48e4856b5f58fdc2e6d35f8193e6150
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Apr 19 12:13:11 2019 -0400

    Set secrets.secret_key_base refs #13996
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/api/config/arvados_config.rb b/services/api/config/arvados_config.rb
index 717ddad9e..f57073dfc 100644
--- a/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@ -256,5 +256,5 @@ Server::Application.configure do
   # Rails.configuration.API["Blah"]
   ConfigLoader.copy_into_config $arvados_config, config
   ConfigLoader.copy_into_config $remaining_config, config
-  config.secret_key_base = config.secret_token
+  secrets.secret_key_base = $arvados_config["API"]["RailsSessionSecretToken"]
 end
diff --git a/services/api/config/secrets.yml b/services/api/config/secrets.yml
deleted file mode 100644
index f21de2d25..000000000
--- a/services/api/config/secrets.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-# Be sure to restart your server when you modify this file.
-
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rails secret` to generate a secure secret key.
-
-# Make sure the secrets in this file are kept private
-# if you're sharing your code publicly.
-
-development:
-  secret_key_base: ef8dfe92893202f906d198094f428aaefa75749338e306ed2874938598cad7153ef0dd3cb8036c618cc7c27bb0c6c559728e8cc224da7cdfa2ad1d02874643b0
-
-test:
-  secret_key_base: 0b5454fe8163063950a7124348e2bc780fabbb022fa15f8a074c2fbcfce8eca480ed46b549b87738904f2bae6617ad949c3c3579e272d486c25aaa0ead563355
-
-# Do not keep production secrets in the repository,
-# instead read values from the environment.
-production:
-  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>

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


hooks/post-receive
--