CLOUD-57217 disable shell for saltuser

hortonworks · Aug 25, 2016 · 7c354f5 · 7c354f5
1 parent b9d711c
commit 7c354f5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 21 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.2.0
+VERSION=0.2.1
 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/saltboot/salt_test.go b/saltboot/salt_test.go
diff --git a/saltboot/user.go b/saltboot/user.go
@@ -44,15 +44,11 @@ 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", "--password", hash, SALT_USER)
+		result, err = ExecCmd("adduser", "-G", "wheel", "-s", "/bin/false", "--password", hash, SALT_USER)
 
 		if err != nil {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err
 		}
-		result, err = ExecCmd("usermod", "-G", "wheel", SALT_USER)
-		if err != nil {
-			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err
-		}
 	} else {
 		log.Printf("[CreateUser] user: %s exsist", SALT_USER)
 	}