X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/18def2a271e02fd64749fe650034f50d1b659e45..0203f7c34ebeedf9611b11de5d9309d5a125d3a5:/lib/boot/passenger.go?ds=sidebyside

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 84f51d0a71..f0cd02946f 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -54,9 +54,9 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
 	if err != nil {
 		return err
 	}
-	for _, version := range []string{"1.16.6", "1.17.3", "2.0.2"} {
+	for _, version := range []string{"2.2.19"} {
 		if !strings.Contains(buf.String(), "("+version+")") {
-			err = super.RunProgram(ctx, runner.src, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2")
+			err = super.RunProgram(ctx, runner.src, runOptions{}, "gem", "install", "--user", "--conservative", "--no-document", "bundler:2.2.19")
 			if err != nil {
 				return err
 			}
@@ -102,7 +102,7 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup
 	if err != nil {
 		return err
 	}
-	port, err := internalPort(runner.svc)
+	host, port, err := internalPort(runner.svc)
 	if err != nil {
 		return fmt.Errorf("bug: no internalPort for %q: %v (%#v)", runner, err, runner.svc)
 	}
@@ -130,7 +130,8 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup
 		cmdline := []string{
 			"bundle", "exec",
 			"passenger", "start",
-			"-p", port,
+			"--address", host,
+			"--port", port,
 			"--log-level", loglevel,
 			"--no-friendly-error-pages",
 			"--disable-anonymous-telemetry",
@@ -141,12 +142,12 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup
 		}
 		opts := runOptions{
 			env: append([]string{
-				"HOME=/var/www",
 				"TMPDIR=" + super.wwwtempdir,
 			}, railsEnv...),
 		}
 		if super.ClusterType == "production" {
 			opts.user = "www-data"
+			opts.env = append(opts.env, "HOME=/var/www")
 		} else {
 			// This would be desirable when changing uid
 			// too, but it fails because /dev/stderr is a