[arvados] updated: 2.1.0-2710-g183029138

git repository hosting git at public.arvados.org
Thu Jul 7 13:52:56 UTC 2022


Summary of changes:
 .../workbench/app/views/users/_show_admin.html.erb |   4 +-
 build/run-build-packages-one-target.sh             |   1 +
 build/run-build-packages.sh                        |   2 +
 doc/_config.yml                                    |   2 +-
 doc/api/keep-s3.html.textile.liquid                |  18 +
 ...ados-sync-external-sources.html.textile.liquid} |  53 +-
 lib/boot/cmd.go                                    |   4 +
 lib/config/config.default.yml                      |   4 +
 lib/controller/integration_test.go                 |  91 ++--
 lib/install/init.go                                |   2 +-
 sdk/go/arvados/fs_base.go                          |  15 +-
 sdk/go/arvados/fs_collection.go                    |   1 +
 sdk/go/arvados/fs_deferred.go                      |   1 +
 sdk/go/arvados/fs_project.go                       |  11 +-
 sdk/go/arvados/fs_site.go                          |  21 +-
 sdk/go/arvados/fs_users.go                         |   4 +-
 sdk/python/tests/nginx.conf                        |   4 +
 .../api/app/controllers/database_controller.rb     |   2 +-
 services/api/test/fixtures/users.yml               |  16 +-
 services/keep-web/s3.go                            |  72 +++
 services/keep-web/s3_test.go                       |  95 +++-
 services/login-sync/bin/arvados-login-sync         |  16 +-
 .../multi_host/aws/pillars/arvados.sls             |   2 +-
 .../multi_host/aws/pillars/postgresql.sls          |   2 +-
 .../aws/states/shell_cron_add_login_sync.sls       |   7 +
 .../multiple_hostnames/pillars/nginx_passenger.sls |   2 +-
 .../multiple_hostnames/pillars/postgresql.sls      |   2 +-
 .../multiple_hostnames/states/host_entries.sls     |   2 +-
 .../single_hostname/pillars/nginx_passenger.sls    |   2 +-
 .../single_hostname/pillars/postgresql.sls         |   2 +-
 .../single_hostname/states/host_entries.sls        |   2 +-
 tools/salt-install/installer.sh                    | 257 ++++++++++
 .../local.params.example.multiple_hosts            |  19 +-
 ...l.params.example.single_host_multiple_hostnames |  11 +
 ...ocal.params.example.single_host_single_hostname |  11 +
 tools/salt-install/provision.sh                    |   4 +-
 tools/sync-users/.gitignore                        |   1 +
 tools/sync-users/sync-users.go                     | 544 +++++++++++++++++++++
 tools/sync-users/sync-users_test.go                | 436 +++++++++++++++++
 39 files changed, 1675 insertions(+), 70 deletions(-)
 rename doc/user/topics/{arvados-sync-groups.html.textile.liquid => arvados-sync-external-sources.html.textile.liquid} (51%)
 create mode 100755 tools/salt-install/installer.sh
 create mode 100644 tools/sync-users/.gitignore
 create mode 100644 tools/sync-users/sync-users.go
 create mode 100644 tools/sync-users/sync-users_test.go

       via  1830291389ed69b950f2f94fbb9155c63e6b4679 (commit)
       via  cd9e72bd95b32203231f6ccc96ddce9325b30a95 (commit)
       via  bc481119881ed9558f05fb86673b39dae0a0428a (commit)
       via  2d29045a1b392251b777639634e527abfd8b06e2 (commit)
       via  4c24ce559f6ff72b2aa621e71c72625a16740bee (commit)
       via  6bcc2cf0dea668fd5c00af9f859e0c4327fbfa14 (commit)
       via  48495e8ed3c15aefa94561ecf7caedc6ad716514 (commit)
       via  36f730574cf6d5f720656de6a102963af5e15cab (commit)
       via  8fdafb5686f03e5f687e4c680be817d024bdcb6b (commit)
       via  1e8ea2315684b951e6d4bde99b98a5b4108f5e4e (commit)
       via  100710416212448cf653a260f9a67933a30656cf (commit)
       via  e7f9b76848ba874c777a950fac1b13a88ce485dd (commit)
       via  016474590b8995d7651aa05bb49d8930f0b1701b (commit)
       via  490aaa38ccb260f94e2ee25e7c6a50c982da35ae (commit)
       via  607033c33f2001c194fe8c68d0dc17e4bde849da (commit)
       via  bdcf09e34f8eec88e1e326094ac60b5d484844e1 (commit)
       via  51f6ce76c7b1e0a297f8265122c2deef436a4065 (commit)
       via  9ae866579b9e62ac11817b8053aaae74be7ea1cf (commit)
       via  b09d1b51bbaa0a7709166187bb007683053205ed (commit)
       via  795a29f42c333ee369e852977e7018fe4c5c94ae (commit)
       via  6eb56e41997fe179d6aae140700c307a09d5b703 (commit)
       via  4aaa7415151412b97b706a442d0487c15b39c495 (commit)
       via  8f69a16eb56dfea60b4abafb4e73a45d19c01476 (commit)
       via  a229aa70a28a4f46fb9ba71bf038655634bcf2d4 (commit)
       via  f699425ce9bd7b5055192e81de31cc10609ba41d (commit)
       via  470641e02dc18aeba8506bd3479511db13492e25 (commit)
       via  4e355db55f12be1944a1e21b9f386e6bc101dcde (commit)
       via  e4cbfb51207a7b3430a9cad983b41527bcf4cf5e (commit)
       via  ffb6a2fbc2552b38dd27b216c9db6539e81cef56 (commit)
       via  f3b0dd8d793994d2661cc416cb4136e85883874e (commit)
       via  2efd88cf64130bb0ebb0549d30053b85baaae2f9 (commit)
       via  0fccbb05425c59e5b2c13954dcb73ec79043f879 (commit)
       via  9ce1f09357f146cefe582690b1468d032866b3ca (commit)
       via  3b470b3778a99c6148f407f25a6ef22bd4bc9a24 (commit)
       via  5fe15b9011228668b4b95f2416a87c376479822a (commit)
       via  d70538d2019716a15159f85079d1174cc84e8407 (commit)
       via  53d1c0d6e9986ae9d0e28fd872cde882284662af (commit)
       via  bf261328ff15d3f9cf5109bfcc505e12f78481fc (commit)
       via  4090574822afd6a7b48ccd277ba84c3cc6244e71 (commit)
       via  093ec98e4a065acfc537ea22c08c337c115fe273 (commit)
       via  09e7068b4b1e0c046eb52dadce4d5d7de813fff2 (commit)
       via  8e26a9aeede967030e10cb93b01aad6bd519b484 (commit)
       via  e39adbe28e6ada009b086a53bc9e4187b824fd0d (commit)
       via  713f0a0a96840404115b57ae92b8a2f2a554383e (commit)
       via  3a7b7f2254e57dc8f273cc468ec9622b759905bd (commit)
       via  e59273e06c41fa1532ab887f62695a2bd6d0e284 (commit)
       via  c47e500a8143b1354624a962eae7f8fc016ba72f (commit)
       via  6d154157c70aaf4a5856b170a1b2eb9395348cc1 (commit)
       via  fc3e2c30b85c138fdbdf440f4f29f5f710de2814 (commit)
       via  7aecff0797f9d282587544b356b105c05f13da21 (commit)
       via  5c32f7ed756e32bb3fa03182730f9fad8aab9897 (commit)
       via  9b9da21b7bcdb593ed0b06b693add9fdb01d3437 (commit)
       via  7c14fcc9171f6fe707a9f17dc44357f00ff51333 (commit)
       via  623bd0b69f9ad3fe3889acc463955630946275d2 (commit)
       via  722fbc71928e7fc6b91eb101788b51c2bb9577eb (commit)
       via  dd8f1b0527995bc5ad47710d3a483fa18b827bc6 (commit)
       via  9568d12b9bb5db7f39c9627d0059c72cfc6f2eb1 (commit)
       via  b041a675c577e174680913e0da0bf69b1cca83b6 (commit)
       via  c502c5a50aae825683ee4cff629c6839a4209501 (commit)
      from  e158fecc41b58f357345ac3114592a429218dc3a (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 1830291389ed69b950f2f94fbb9155c63e6b4679
Author: Tom Clegg <tom at curii.com>
Date:   Thu Jul 7 09:49:12 2022 -0400

    16552: Comment in config template re autocert implementation status.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 29d9d9cc4..c8c02cc60 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -911,6 +911,10 @@ Clusters:
 
       # Agree to Let's Encrypt terms of service and obtain
       # certificates automatically for ExternalURL domains.
+      #
+      # Note: this feature is not yet implemented in released
+      # versions, only in the alpha/prerelease arvados-server-easy
+      # package.
       Automatic: false
 
       # Use Let's Encrypt staging environment instead of production

commit cd9e72bd95b32203231f6ccc96ddce9325b30a95
Merge: 8fdafb568 bc4811198
Author: Tom Clegg <tom at curii.com>
Date:   Thu Jul 7 09:42:02 2022 -0400

    16552: Merge branch 'main'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>


commit 8fdafb5686f03e5f687e4c680be817d024bdcb6b
Author: Tom Clegg <tom at curii.com>
Date:   Mon Jul 4 10:08:44 2022 -0400

    16552: Fix default websocket external port and proxy config.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/init.go b/lib/install/init.go
index b2de067ff..8c565bb5d 100644
--- a/lib/install/init.go
+++ b/lib/install/init.go
@@ -154,7 +154,7 @@ func (initcmd *initCommand) RunCommand(prog string, args []string, stdin io.Read
       Websocket:
         InternalURLs:
           "http://0.0.0.0:8005/": {}
-        ExternalURL: {{printf "%q" ( print "wss://" .Domain ":4436/" ) }}
+        ExternalURL: {{printf "%q" ( print "wss://" .Domain ":4446/" ) }}
       Keepbalance:
         InternalURLs:
           "http://0.0.0.0:9019/": {}
diff --git a/sdk/python/tests/nginx.conf b/sdk/python/tests/nginx.conf
index 1c624e324..4ad3eda42 100644
--- a/sdk/python/tests/nginx.conf
+++ b/sdk/python/tests/nginx.conf
@@ -144,6 +144,10 @@ http {
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto https;
       proxy_redirect off;
+
+      client_max_body_size 0;
+      proxy_http_version 1.1;
+      proxy_request_buffering off;
     }
   }
   upstream workbench1 {

commit 1e8ea2315684b951e6d4bde99b98a5b4108f5e4e
Author: Tom Clegg <tom at curii.com>
Date:   Sun Jul 3 00:50:40 2022 -0400

    16552: Use sdnotify to signal to systemd that service is up.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/boot/cmd.go b/lib/boot/cmd.go
index e22ae7ad7..4b7284556 100644
--- a/lib/boot/cmd.go
+++ b/lib/boot/cmd.go
@@ -15,6 +15,7 @@ import (
 
 	"git.arvados.org/arvados.git/lib/cmd"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	"github.com/coreos/go-systemd/daemon"
 )
 
 var Command cmd.Handler = bootCommand{}
@@ -134,6 +135,9 @@ func (bcmd bootCommand) run(ctx context.Context, prog string, args []string, std
 			return nil
 		}
 	}
+	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
+		super.logger.WithError(err).Errorf("error notifying init daemon")
+	}
 	// Wait for signal/crash + orderly shutdown
 	return super.Wait()
 }

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list