gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-11 09:10:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixing server path

Browse source
This commit is contained in:
afeiszli 2021-10-02 12:51:23 -04:00
parent 480a52df34
commit 86c3ac6da7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
serverctl/serverctl.go
View file

@ -87,12 +87,12 @@ func copy(src, dst string) (int64, error) {
func RemoveNetwork(network string) (bool, error) { func RemoveNetwork(network string) (bool, error) {
netclientPath := ncutils.GetNetclientPath() netclientPath := ncutils.GetNetclientPath()
_, err := os.Stat(netclientPath + "netclient") _, err := os.Stat(netclientPath + "/netclient")
if err != nil { if err != nil {
log.Println("could not find " + netclientPath + "netclient") log.Println("could not find " + netclientPath + "/netclient")
return false, err return false, err
} }
_, err = ncutils.RunCmd(netclientPath+"netclient leave -n "+network, true) _, err = ncutils.RunCmd(netclientPath+"/netclient leave -n "+network, true)
if err == nil { if err == nil {
log.Println("Server removed from network " + network) log.Println("Server removed from network " + network)
} }
@ -103,21 +103,21 @@ func RemoveNetwork(network string) (bool, error) {
func InitServerNetclient() error { func InitServerNetclient() error {
netclientDir := ncutils.GetNetclientPath() netclientDir := ncutils.GetNetclientPath()
netclientPath := ncutils.GetNetclientPathSpecific() netclientPath := ncutils.GetNetclientPathSpecific()
_, err := os.Stat(netclientDir) _, err := os.Stat(netclientPath)
if os.IsNotExist(err) { if os.IsNotExist(err) {
os.Mkdir(netclientDir, 744) os.MkdirAll(netclientDir, 744)
} else if err != nil { } else if err != nil {
log.Println("could not find or create", netclientDir) log.Println("could not find or create", netclientDir)
return err return err
} }
_, err = os.Stat(netclientPath + "netclient") _, err = os.Stat(netclientDir + "/netclient")
if os.IsNotExist(err) { if os.IsNotExist(err) {
err = InstallNetclient() err = InstallNetclient()
if err != nil { if err != nil {
return err return err
} }
} }
err = os.Chmod(netclientPath+"netclient", 0755) err = os.Chmod(netclientDir+"/netclient", 0755)
if err != nil { if err != nil {
log.Println("could not change netclient binary permissions") log.Println("could not change netclient binary permissions")
return err return err
@ -129,7 +129,7 @@ func HandleContainedClient() error {
log.SetFlags(log.Flags() &^ (log.Llongfile | log.Lshortfile)) log.SetFlags(log.Flags() &^ (log.Llongfile | log.Lshortfile))
netclientPath := ncutils.GetNetclientPath() netclientPath := ncutils.GetNetclientPath()
checkinCMD := exec.Command(netclientPath+"netclient", "checkin", "-n", "all") checkinCMD := exec.Command(netclientPath+"/netclient", "checkin", "-n", "all")
if servercfg.GetVerbose() >= 2 { if servercfg.GetVerbose() >= 2 {
checkinCMD.Stdout = os.Stdout checkinCMD.Stdout = os.Stdout
} }
@ -169,9 +169,9 @@ func AddNetwork(network string) (bool, error) {
functions.PrintUserLog(models.NODE_SERVER_NAME, "executing network join: "+netclientPath+"netclient "+"join "+"-t "+token+" -name "+models.NODE_SERVER_NAME+" -endpoint "+pubip, 0) functions.PrintUserLog(models.NODE_SERVER_NAME, "executing network join: "+netclientPath+"netclient "+"join "+"-t "+token+" -name "+models.NODE_SERVER_NAME+" -endpoint "+pubip, 0)
var joinCMD *exec.Cmd var joinCMD *exec.Cmd
if servercfg.IsClientMode() == "contained" { if servercfg.IsClientMode() == "contained" {
joinCMD = exec.Command(netclientPath+"netclient", "join", "-t", token, "-name", models.NODE_SERVER_NAME, "-endpoint", pubip, "-daemon", "off", "-dnson", "no") joinCMD = exec.Command(netclientPath+"/netclient", "join", "-t", token, "-name", models.NODE_SERVER_NAME, "-endpoint", pubip, "-daemon", "off", "-dnson", "no")
} else { } else {
joinCMD = exec.Command(netclientPath+"netclient", "join", "-t", token, "-name", models.NODE_SERVER_NAME, "-endpoint", pubip) joinCMD = exec.Command(netclientPath+"/netclient", "join", "-t", token, "-name", models.NODE_SERVER_NAME, "-endpoint", pubip)
} }
joinCMD.Stdout = os.Stdout joinCMD.Stdout = os.Stdout
joinCMD.Stderr = os.Stderr joinCMD.Stderr = os.Stderr