Merge branch '17246-salt-install-improvements'

[arvados.git] / lib / boot / passenger.go

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 84f51d0a71d19cd6cc2a5c2f42d4947a18952e02..0340ebc8c64272944cf202fd2ec2c5c9f0788f32 100644 (file)
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -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,9 @@ 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-file", "/dev/stderr",
                        "--log-level", loglevel,
                        "--no-friendly-error-pages",
                        "--disable-anonymous-telemetry",
@@ -141,12 +143,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