ref(boot.go,pkg/builder.go,pkg/sshd/server.go): pull the hard-coded git home dir out of pkg/sshd

to prepare for the deleted app cleaner’s usage of it

Author: Aaron Schlesinger

boot.go

@@ -4,6 +4,7 @@ import (
 	"log"
 	"os"
 	"runtime"
+	"time"
 
 	cookoolog "github.com/Masterminds/cookoo/log"
 	"github.com/codegangsta/cli"
@@ -20,6 +21,8 @@ import (
 const (
 	serverConfAppName     = "deis-builder-server"
 	gitReceiveConfAppName = "deis-builder-git-receive"
+	gitHomeDir            = "/home/git"
+	cleanerPollDuration   = 1 * time.Second // TODO: make this configurable
 )
 
 func init() {
@@ -69,7 +72,7 @@ func main() {
 				log.Printf("Starting SSH server on %s:%d", cnf.SSHHostIP, cnf.SSHHostPort)
 				sshCh := make(chan int)
 				go func() {
-					sshCh <- pkg.RunBuilder(cnf.SSHHostIP, cnf.SSHHostPort, circ)
+					sshCh <- pkg.RunBuilder(cnf.SSHHostIP, cnf.SSHHostPort, gitHomeDir, circ)
 				}()
 
 				select {

pkg/builder.go

@@ -27,7 +27,7 @@ const (
 // Git.
 //
 // Run returns on of the Status* status code constants.
-func RunBuilder(sshHostIP string, sshHostPort int, sshServerCircuit *sshd.Circuit) int {
+func RunBuilder(sshHostIP string, sshHostPort int, gitHomeDir string, sshServerCircuit *sshd.Circuit) int {
 	reg, router, ocxt := cookoo.Cookoo()
 	log.SetFlags(0) // Time is captured elsewhere.
 
@@ -58,7 +58,7 @@ func RunBuilder(sshHostIP string, sshHostPort int, sshServerCircuit *sshd.Circui
 	// Start the SSH service.
 	// TODO: We could refactor Serve to be a command, and then run this as
 	// a route.
-	if err := sshd.Serve(reg, router, sshServerCircuit, cxt); err != nil {
+	if err := sshd.Serve(reg, router, sshServerCircuit, gitHomeDir, cxt); err != nil {
 		clog.Errf(cxt, "SSH server failed: %s", err)
 		return StatusLocalError
 	}

pkg/sshd/server.go

@@ -54,7 +54,7 @@ var (
 //
 // This puts the following variables into the context:
 // 	- ssh.Closer (chan interface{}): Send a message to this to shutdown the server.
-func Serve(reg *cookoo.Registry, router *cookoo.Router, serverCircuit *Circuit, c cookoo.Context) cookoo.Interrupt {
+func Serve(reg *cookoo.Registry, router *cookoo.Router, serverCircuit *Circuit, gitHomeDir string, c cookoo.Context) cookoo.Interrupt {
 	hostkeys := c.Get(HostKeys, []ssh.Signer{}).([]ssh.Signer)
 	addr := c.Get(Address, "0.0.0.0:2223").(string)
 	cfg := c.Get(ServerConfig, &ssh.ServerConfig{}).(*ssh.ServerConfig)
@@ -71,7 +71,7 @@ func Serve(reg *cookoo.Registry, router *cookoo.Router, serverCircuit *Circuit,
 
 	srv := &server{
 		c:       c,
-		gitHome: "/home/git",
+		gitHome: gitHomeDir,
 	}
 
 	closer := make(chan interface{}, 1)