16306: Fix permission issues.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/boot/supervisor.go b/lib/boot/supervisor.go
index 20576b6b9739dfa70e875371c9b97fc21ae070b5..7dba9b5dcf9ae35e1712a817a805d4361cf71da5 100644 (file)
--- a/lib/boot/supervisor.go
+++ b/lib/boot/supervisor.go
@@ -162,7 +162,7 @@ func (super *Supervisor) run(cfg *arvados.Config) error {
        if err != nil {
                return err
        }
-       conffile, err := os.OpenFile(filepath.Join(super.tempdir, "config.yml"), os.O_CREATE|os.O_WRONLY, 0644)
+       conffile, err := os.OpenFile(filepath.Join(super.wwwtempdir, "config.yml"), os.O_CREATE|os.O_WRONLY, 0644)
        if err != nil {
                return err
        }

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 2b0faefe2680fe5ebc231ca2dc4d1643acf95927..4f5b251cb27af575338124213638aaaeed7606a5 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -446,7 +446,7 @@ rm ${zip}
                } {
                        fmt.Fprintf(stderr, "building %s...\n", srcdir)
                        cmd := exec.Command("rsync",
-                               "-a", "--no-owner", "--delete-after", "--delete-excluded",
+                               "-a", "--no-owner", "--no-group", "--delete-after", "--delete-excluded",
                                "--exclude", "/coverage",
                                "--exclude", "/log",
                                "--exclude", "/tmp",
@@ -469,7 +469,6 @@ rm ${zip}
                                {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "install-standalone-runtime"},
                        } {
                                cmd = exec.Command(cmdline[0], cmdline[1:]...)
-                               cmd.Env = append([]string{}, os.Environ()...)
                                cmd.Dir = "/var/lib/arvados/" + dstdir
                                cmd.Stdout = stdout
                                cmd.Stderr = stderr