chore: dirs

anatolystansler · anatolystansler · commit 53d0a39d103a · 2019-12-13T15:03:55.000+03:00
diff --git a/src/provision/mode_zfs.go b/src/provision/mode_zfs.go
@@ -365,7 +365,7 @@ func (j *provisionModeZfs) getPgConfig(name string, port uint) *PgConfig {
 	return &PgConfig{
 		Version:  j.config.PgVersion,
 		Bindir:   j.config.PgBindir,
-		Datadir:  name + j.config.PgDataSubdir,
+		Datadir:  MOUNT_PREFIX + name + j.config.PgDataSubdir,
 		Host:     "localhost",
 		Port:     port,
 		Name:     "postgres",
diff --git a/src/provision/postgres.go b/src/provision/postgres.go
@@ -18,7 +18,7 @@ import (
 	"../util"
 )
 
-const LOGS_PREFIX = "dblab_postgres_"
+const LOGS_PREFIX = "/var/lib/postgresql/dblab/logs/dblab_"
 
 // We use pg_stop -D ... -m immediate stop because we need to shut down
 // Postgres faster and completely get rid of this instance. So we don't care
@@ -82,10 +82,9 @@ func PostgresStart(r Runner, c *PgConfig) error {
 	log.Dbg("Starting Postgres...")
 
 	portStr := c.getPortStr()
-	logdir := "/var/log/" + LOGS_PREFIX + portStr + ".log"
+	logdir := LOGS_PREFIX + portStr + ".log"
 
-	createLogsCmd := "sudo touch " + logdir + " && " +
-		"sudo chown postgres " + logdir
+	createLogsCmd := "sudo -u postgres -s touch " + logdir
 	out, err := r.Run(createLogsCmd, true)
 	if err != nil {
 		return fmt.Errorf("Postgres start: log touch %v %v", err, out)
diff --git a/src/provision/zfs.go b/src/provision/zfs.go
@@ -14,6 +14,10 @@ import (
 	"../util"
 )
 
+const (
+	MOUNT_PREFIX = "/var/lib/postgresql/dblab/clones/"
+)
+
 type ZfsListEntry struct {
 	Name string
 
@@ -72,9 +76,9 @@ func ZfsCreateClone(r Runner, pool string, name string, snapshot string) error {
 	}
 
 	cmd := "sudo zfs clone " + pool + "@" + snapshot + " " +
-		pool + "/" + name + " -o mountpoint=/" + name + " && " +
+		pool + "/" + name + " -o mountpoint=" + MOUNT_PREFIX + name + " && " +
 		// TODO(anatoly): Refactor using of chown.
-		"sudo chown -R postgres /" + name
+		"sudo chown -R postgres " + MOUNT_PREFIX + name
 
 	out, err := r.Run(cmd)
 	if err != nil {
