X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/07dbd859d0b05d79680570c00c43a722102d7ea3..ae92d144610446849eb568247a44f02ae985c281:/lib/boot/passenger.go

diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go
index 6a2c4b61f5..f0cd02946f 100644
--- a/lib/boot/passenger.go
+++ b/lib/boot/passenger.go
@@ -37,6 +37,10 @@ func (runner installPassenger) String() string {
 }
 
 func (runner installPassenger) Run(ctx context.Context, fail func(error), super *Supervisor) error {
+	if super.ClusterType == "production" {
+		// passenger has already been installed via package
+		return nil
+	}
 	err := super.wait(ctx, runner.depends...)
 	if err != nil {
 		return err
@@ -46,32 +50,32 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
 	defer passengerInstallMutex.Unlock()
 
 	var buf bytes.Buffer
-	err = super.RunProgram(ctx, runner.src, &buf, nil, "gem", "list", "--details", "bundler")
+	err = super.RunProgram(ctx, runner.src, runOptions{output: &buf}, "gem", "list", "--details", "bundler")
 	if err != nil {
 		return err
 	}
-	for _, version := range []string{"1.11.0", "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, nil, nil, "gem", "install", "--user", "bundler:1.11", "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
 			}
 			break
 		}
 	}
-	err = super.RunProgram(ctx, runner.src, nil, nil, "bundle", "install", "--jobs", "4", "--path", filepath.Join(os.Getenv("HOME"), ".gem"))
+	err = super.RunProgram(ctx, runner.src, runOptions{}, "bundle", "install", "--jobs", "4", "--path", filepath.Join(os.Getenv("HOME"), ".gem"))
 	if err != nil {
 		return err
 	}
-	err = super.RunProgram(ctx, runner.src, nil, nil, "bundle", "exec", "passenger-config", "build-native-support")
+	err = super.RunProgram(ctx, runner.src, runOptions{}, "bundle", "exec", "passenger-config", "build-native-support")
 	if err != nil {
 		return err
 	}
-	err = super.RunProgram(ctx, runner.src, nil, nil, "bundle", "exec", "passenger-config", "install-standalone-runtime")
+	err = super.RunProgram(ctx, runner.src, runOptions{}, "bundle", "exec", "passenger-config", "install-standalone-runtime")
 	if err != nil {
 		return err
 	}
-	err = super.RunProgram(ctx, runner.src, nil, nil, "bundle", "exec", "passenger-config", "validate-install")
+	err = super.RunProgram(ctx, runner.src, runOptions{}, "bundle", "exec", "passenger-config", "validate-install")
 	if err != nil && !strings.Contains(err.Error(), "exit status 2") {
 		// Exit code 2 indicates there were warnings (like
 		// "other passenger installations have been detected",
@@ -83,9 +87,10 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super
 }
 
 type runPassenger struct {
-	src     string
-	svc     arvados.Service
-	depends []supervisedTask
+	src       string // path to app in source tree
+	varlibdir string // path to app (relative to /var/lib/arvados) in OS package
+	svc       arvados.Service
+	depends   []supervisedTask
 }
 
 func (runner runPassenger) String() string {
@@ -97,10 +102,16 @@ 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)
 	}
+	var appdir string
+	if super.ClusterType == "production" {
+		appdir = "/var/lib/arvados/" + runner.varlibdir
+	} else {
+		appdir = runner.src
+	}
 	loglevel := "4"
 	if lvl, ok := map[string]string{
 		"debug":   "5",
@@ -116,13 +127,36 @@ func (runner runPassenger) Run(ctx context.Context, fail func(error), super *Sup
 	super.waitShutdown.Add(1)
 	go func() {
 		defer super.waitShutdown.Done()
-		err = super.RunProgram(ctx, runner.src, nil, railsEnv, "bundle", "exec",
+		cmdline := []string{
+			"bundle", "exec",
 			"passenger", "start",
-			"-p", port,
-			"--log-file", "/dev/stderr",
+			"--address", host,
+			"--port", port,
 			"--log-level", loglevel,
 			"--no-friendly-error-pages",
-			"--pid-file", filepath.Join(super.tempdir, "passenger."+strings.Replace(runner.src, "/", "_", -1)+".pid"))
+			"--disable-anonymous-telemetry",
+			"--disable-security-update-check",
+			"--no-compile-runtime",
+			"--no-install-runtime",
+			"--pid-file", filepath.Join(super.wwwtempdir, "passenger."+strings.Replace(appdir, "/", "_", -1)+".pid"),
+		}
+		opts := runOptions{
+			env: append([]string{
+				"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
+			// 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:]...)
 		fail(err)
 	}()
 	return nil