[ARVADOS] updated: 1.1.4-695-g9cc572d6a

[Git user]

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base     |  2 +-
 tools/arvbox/lib/arvbox/docker/api-setup.sh        |  2 +-
 tools/arvbox/lib/arvbox/docker/common.sh           |  4 +-
 tools/arvbox/lib/arvbox/docker/crunch-setup.sh     |  2 +-
 tools/arvbox/lib/arvbox/docker/keep-setup.sh       |  2 +-
 .../lib/arvbox/docker/service/api/run-service      |  4 +-
 .../docker/service/arv-git-httpd/run-service       |  2 +-
 .../lib/arvbox/docker/service/composer/run-service |  2 +-
 .../service/{api => controller}/log/main/.gitstub  |  0
 .../docker/service/{api => controller}/log/run     |  0
 .../lib/arvbox/docker/service/controller/run       | 50 ++++++++++++++++++++
 .../service/crunch-dispatch-local/run-service      |  2 +-
 .../lib/arvbox/docker/service/doc/run-service      | 31 +------------
 .../lib/arvbox/docker/service/gitolite/run-service |  4 +-
 .../lib/arvbox/docker/service/keep-web/run-service |  2 +-
 .../arvbox/docker/service/keepproxy/run-service    |  2 +-
 .../service/{api => nginx}/log/main/.gitstub       |  0
 .../arvbox/docker/service/{api => nginx}/log/run   |  0
 .../lib/arvbox/docker/service/{api => nginx}/run   |  0
 .../lib/arvbox/docker/service/nginx/run-service    | 54 ++++++++++++++++++++++
 .../lib/arvbox/docker/service/ready/run-service    |  2 +-
 .../lib/arvbox/docker/service/sso/run-service      |  2 +-
 tools/arvbox/lib/arvbox/docker/service/vm/run      |  2 +-
 .../lib/arvbox/docker/service/vm/run-service       |  2 +-
 .../arvbox/docker/service/websockets/run-service   |  2 +-
 .../arvbox/docker/service/workbench/run-service    |  6 +--
 ...application_yml_override.py => yml_override.py} |  9 ++--
 27 files changed, 135 insertions(+), 55 deletions(-)
 copy tools/arvbox/lib/arvbox/docker/service/{api => controller}/log/main/.gitstub (100%)
 copy tools/arvbox/lib/arvbox/docker/service/{api => controller}/log/run (100%)
 create mode 100755 tools/arvbox/lib/arvbox/docker/service/controller/run
 copy tools/arvbox/lib/arvbox/docker/service/{api => nginx}/log/main/.gitstub (100%)
 copy tools/arvbox/lib/arvbox/docker/service/{api => nginx}/log/run (100%)
 copy tools/arvbox/lib/arvbox/docker/service/{api => nginx}/run (100%)
 create mode 100755 tools/arvbox/lib/arvbox/docker/service/nginx/run-service
 rename tools/arvbox/lib/arvbox/docker/{application_yml_override.py => yml_override.py} (79%)

       via  9cc572d6a44262e21251372e28b549cfc09e681a (commit)
       via  115e837fd16eecd80868267b0a6f99a531d4cc93 (commit)
       via  3271e860e871b19a2f3be68376c57c2ce88993ac (commit)
      from  bef56b9a22efac9ce73006623080e84a0b57f243 (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 9cc572d6a44262e21251372e28b549cfc09e681a
Merge: bef56b9a2 115e837fd
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Jul 20 16:52:52 2018 -0400

    Merge branch '13879-arvados-server' closes #13879
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit 115e837fd16eecd80868267b0a6f99a531d4cc93
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Jul 20 16:51:03 2018 -0400

    13879: Fix cut and paste typo.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/service/nginx/run-service b/tools/arvbox/lib/arvbox/docker/service/nginx/run-service
index 6e9ae2b29..a55660eb8 100755
--- a/tools/arvbox/lib/arvbox/docker/service/nginx/run-service
+++ b/tools/arvbox/lib/arvbox/docker/service/nginx/run-service
@@ -36,7 +36,7 @@ http {
   }
   server {
     listen *:${services[controller-ssl]} ssl default_server;
-    server_name keepproxy;
+    server_name controller;
     ssl_certificate "/var/lib/arvados/self-signed.pem";
     ssl_certificate_key "/var/lib/arvados/self-signed.key";
     location  / {

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


hooks/post-receive
--