CLOUD-57217 do not create home directory and print out version by default

akanto · akanto · commit 57f4fdc2264a · 2016-08-26T09:45:58.000+02:00
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.2.2
+VERSION=0.3.0
 BUILD_TIME=$(shell date +%FT%T)
 LDFLAGS=-ldflags "-X github.com/sequenceiq/salt-bootstrap/saltboot.Version=${VERSION} -X github.com/sequenceiq/salt-bootstrap/saltboot.BuildTime=${BUILD_TIME}"
 
diff --git a/main.go b/main.go
@@ -24,5 +24,6 @@ func main() {
 	log.SetOutput(io.MultiWriter(os.Stdout, logFile))
 
 	log.Println("[main] Launch salt-bootstrap application")
+	log.Printf("[main] Version: %s-%s", saltboot.Version, saltboot.BuildTime)
 	saltboot.NewCloudbreakBootstrapWeb()
 }
diff --git a/saltboot/user.go b/saltboot/user.go
@@ -44,7 +44,7 @@ func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {
 		if err != nil {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err
 		}
-		result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)
+		result, err = ExecCmd("adduser", "--no-create-home", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)
 
 		if err != nil {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,6 @@ func main() {`
`24`	`24`	`log.SetOutput(io.MultiWriter(os.Stdout, logFile))`
`25`	`25`
`26`	`26`	`log.Println("[main] Launch salt-bootstrap application")`
	`27`	`+ log.Printf("[main] Version: %s-%s", saltboot.Version, saltboot.BuildTime)`
`27`	`28`	`saltboot.NewCloudbreakBootstrapWeb()`
`28`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {`
`44`	`44`	`if err != nil {`
`45`	`45`	`return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err`
`46`	`46`	`}`
`47`		`- result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)`
	`47`	`+ result, err = ExecCmd("adduser", "--no-create-home", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)`
`48`	`48`
`49`	`49`	`if err != nil {`
`50`	`50`	`return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err`