[ARVADOS-DEV] updated: 91b7d5d373a317e341054a256aed46800c1eb918

[git at public.curoverse.com]

Summary of changes:
 arvbox/lib/arvbox/docker/service/api/run-service | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

       via  91b7d5d373a317e341054a256aed46800c1eb918 (commit)
       via  d1fc5ede6afc84fca17b2125a9f6a775538a1cd4 (commit)
      from  0accddbffff3a0e438c2a418ba2f82522e882f30 (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 91b7d5d373a317e341054a256aed46800c1eb918
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 6 20:56:41 2016 -0500

    8080: Fix up whitespace.

diff --git a/arvbox/lib/arvbox/docker/service/api/run-service b/arvbox/lib/arvbox/docker/service/api/run-service
index 6c09e4b..5b5bb1c 100755
--- a/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/arvbox/lib/arvbox/docker/service/api/run-service
@@ -11,17 +11,17 @@ export RAILS_ENV=development
 run_bundler --without=development
 
 if ! test -s /var/lib/arvados/api_uuid_prefix ; then
-  ruby -e 'puts "#{rand(2**64).to_s(36)[0,5]}"' > /var/lib/arvados/api_uuid_prefix
+    ruby -e 'puts "#{rand(2**64).to_s(36)[0,5]}"' > /var/lib/arvados/api_uuid_prefix
 fi
 uuid_prefix=$(cat /var/lib/arvados/api_uuid_prefix)
 
 if ! test -s /var/lib/arvados/api_secret_token ; then
-  ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/api_secret_token
+    ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/api_secret_token
 fi
 secret_token=$(cat /var/lib/arvados/api_secret_token)
 
 if ! test -s /var/lib/arvados/blob_signing_key ; then
-  ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/blob_signing_key
+    ruby -e 'puts rand(2**400).to_s(36)' > /var/lib/arvados/blob_signing_key
 fi
 blob_signing_key=$(cat /var/lib/arvados/blob_signing_key)
 
@@ -56,9 +56,9 @@ fi
 database_pw=$(cat /var/lib/arvados/api_database_pw)
 
 if ! test -f /var/lib/arvados/api_user_setup ; then
-   psql -c "create user arvados with password '$database_pw'"
-   psql -c "ALTER USER arvados CREATEDB;"
-   touch /var/lib/arvados/api_user_setup
+    psql -c "create user arvados with password '$database_pw'"
+    psql -c "ALTER USER arvados CREATEDB;"
+    touch /var/lib/arvados/api_user_setup
 fi
 
 cat >config/database.yml <<EOF
@@ -94,6 +94,6 @@ rm -rf tmp
 bundle exec rake db:migrate
 
 ARVADOS_WEBSOCKETS=1 exec bundle exec passenger start --port=3001 \
-                  --runtime-dir=/var/lib/passenger \
-                  --ssl --ssl-certificate=/var/lib/arvados/self-signed.pem \
-                  --ssl-certificate-key=/var/lib/arvados/self-signed.key
+    --runtime-dir=/var/lib/passenger \
+    --ssl --ssl-certificate=/var/lib/arvados/self-signed.pem \
+    --ssl-certificate-key=/var/lib/arvados/self-signed.key

commit d1fc5ede6afc84fca17b2125a9f6a775538a1cd4
Author: Tom Clegg <tom at curoverse.com>
Date:   Wed Jan 6 20:56:03 2016 -0500

    8080: Do not override blob_signing_key (or git_repo_*) in test config.

diff --git a/arvbox/lib/arvbox/docker/service/api/run-service b/arvbox/lib/arvbox/docker/service/api/run-service
index 56988fe..6c09e4b 100755
--- a/arvbox/lib/arvbox/docker/service/api/run-service
+++ b/arvbox/lib/arvbox/docker/service/api/run-service
@@ -33,17 +33,17 @@ sso_app_secret=$(cat /var/lib/arvados/sso_app_secret)
 cat >config/application.yml <<EOF
 common:
   secret_token: $secret_token
-  blob_signing_key: $blob_signing_key
   sso_app_secret: $sso_app_secret
   sso_app_id: arvados-server
   sso_provider_url: "https://$localip:3002"
   workbench_address: "http://$localip/"
   sso_insecure: true
+development:
+  uuid_prefix: $uuid_prefix
   auto_admin_first_user: true
+  blob_signing_key: $blob_signing_key
   git_repo_ssh_base: "git@$localip:"
   git_repo_https_base: "http://$localip:9001/"
-development:
-  uuid_prefix: $uuid_prefix
 test:
   uuid_prefix: zzzzz
   git_repo_ssh_base: "git at git.zzzzz.arvadosapi.com:"

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


hooks/post-receive
--