[ARVADOS] created: 774edf5b8449b4fc53dc4d1f1c00e32c15a20093

[git at public.curoverse.com]

        at  774edf5b8449b4fc53dc4d1f1c00e32c15a20093 (commit)


commit 774edf5b8449b4fc53dc4d1f1c00e32c15a20093
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 24 20:40:33 2014 -0400

    3349: Update to ruby 2.1.2

diff --git a/doc/install/install-api-server.html.textile.liquid b/doc/install/install-api-server.html.textile.liquid
index 0d721fc..ff87749 100644
--- a/doc/install/install-api-server.html.textile.liquid
+++ b/doc/install/install-api-server.html.textile.liquid
@@ -24,9 +24,9 @@ We recommend Ruby >= 2.1.
 <notextile>
 <pre><code><span class="userinput">mkdir -p ~/src
 cd ~/src
-wget http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.1.tar.gz
-tar xzf ruby-2.1.1.tar.gz
-cd ruby-2.1.1
+wget http://cache.ruby-lang.org/pub/ruby/2.1/ruby-2.1.2.tar.gz
+tar xzf ruby-2.1.2.tar.gz
+cd ruby-2.1.2
 ./configure
 make
 sudo make install

commit c7e1701d9b2a5704bd69ba78a7e59d90b6e556d6
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jul 24 20:40:16 2014 -0400

    3349: Consolidate comments in application.default.yml

diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index 827dfe1..dc00e33 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -139,6 +139,12 @@ common:
   # address of the dedicated websocket server:
   #websocket_address: wss://127.0.0.1:3333/websocket
 
+  # blob_signing_key is a string of alphanumeric characters used to
+  # generate permission signatures for Keep locators. It must be
+  # identical to the permission key given to Keep. IMPORTANT: This is
+  # a site secret. It should be at least 50 characters.
+  blob_signing_key: ~
+
   # Amount of time (in seconds) for which a blob permission signature
   # remains valid.  Default: 2 weeks (1209600 seconds)
   blob_signing_ttl: 1209600
@@ -153,3 +159,8 @@ common:
   # do not turn this on if your users expect to keep data private from
   # one another!
   permit_create_collection_with_unsigned_manifest: false
+
+  # secret_token is a string of alphanumeric characters used by Rails
+  # to sign session tokens. IMPORTANT: This is a site secret. It
+  # should be at least 50 characters.
+  secret_token: ~
diff --git a/services/api/config/application.yml.example b/services/api/config/application.yml.example
index d6db3a4..b6e8d93 100644
--- a/services/api/config/application.yml.example
+++ b/services/api/config/application.yml.example
@@ -11,21 +11,13 @@
 # 5. Section in application.default.yml called "common"
 
 development:
-  # The blob_signing_key is a string of alphanumeric characters used
-  # to sign permission hints for Keep locators. It must be identical
-  # to the permission key given to Keep.  If you run both apiserver
-  # and Keep in development, change this to a hardcoded string and
-  # make sure both systems use the same value.
+  # Mandatory site secrets. See application.default.yml for more info.
+  secret_token: ~
   blob_signing_key: ~
 
 production:
-  # At minimum, you need a nice long randomly generated secret_token here.
-  # Use a long string of alphanumeric characters (at least 36).
+  # Mandatory site secrets. See application.default.yml for more info.
   secret_token: ~
-
-  # blob_signing_key is required and must be identical to the
-  # permission secret provisioned to Keep.
-  # Use a long string of alphanumeric characters (at least 36).
   blob_signing_key: ~
 
   uuid_prefix: bogus

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


hooks/post-receive
--