Merge branch '17299-uppercase-api'

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

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 4a605e35afb3c1a16346b74af0bba24522c1d720..4203939975618f9283b462866c1f16b14d16b5dd 100644 (file)
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -141,18 +141,18 @@ 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 in the production
-                       // case too, but it fails with sudo because
-                       // /dev/stderr is a symlink to a pty owned by
-                       // root: "nginx: [emerg] open() "/dev/stderr"
-                       // failed (13: Permission denied)"
+                       // This would be desirable when changing uid
+                       // too, but it fails because /dev/stderr is a
+                       // symlink to a pty owned by root: "nginx:
+                       // [emerg] open() "/dev/stderr" failed (13:
+                       // Permission denied)"
                        cmdline = append(cmdline, "--log-file", "/dev/stderr")
                }
                err = super.RunProgram(ctx, appdir, opts, cmdline[0], cmdline[1:]...)