Browse Source

join after register

Matthew R. Kasun 3 years ago
parent
commit
de7ca68c23
2 changed files with 4 additions and 4 deletions
  1. 2 2
      netclient/functions/daemon.go
  2. 2 2
      netclient/functions/register.go

+ 2 - 2
netclient/functions/daemon.go

@@ -57,7 +57,7 @@ func Daemon() error {
 		//temporary code --- remove in version v0.13.0
 		//temporary code --- remove in version v0.13.0
 		removeHostDNS(network, ncutils.IsWindows())
 		removeHostDNS(network, ncutils.IsWindows())
 		// end of code to be removed in version v0.13.0
 		// end of code to be removed in version v0.13.0
-		//initialPull(cfg.Network)
+		initialPull(cfg.Network)
 	}
 	}
 
 
 	// == subscribe to all nodes for each on machine ==
 	// == subscribe to all nodes for each on machine ==
@@ -277,7 +277,7 @@ func NewTLSConfig(cfg *config.ClientConfig, server string) *tls.Config {
 	if cfg != nil {
 	if cfg != nil {
 		server = cfg.Server.Server
 		server = cfg.Server.Server
 	}
 	}
-	file = "/etc/netclient/" + server + "/server.pem"
+	file = "/etc/netclient/" + server + "/root.pem"
 	certpool := x509.NewCertPool()
 	certpool := x509.NewCertPool()
 	ca, err := os.ReadFile(file)
 	ca, err := os.ReadFile(file)
 	if err != nil {
 	if err != nil {

+ 2 - 2
netclient/functions/register.go

@@ -41,7 +41,7 @@ func Register(cfg *config.ClientConfig) error {
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}
-	url := cfg.Server.API + "/api/server/register"
+	url := "https://" + cfg.Server.API + "/api/server/register"
 	log.Println("register at ", url)
 	log.Println("register at ", url)
 
 
 	request, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(payload))
 	request, err := http.NewRequest(http.MethodPost, url, bytes.NewBuffer(payload))
@@ -76,5 +76,5 @@ func Register(cfg *config.ClientConfig) error {
 		return err
 		return err
 	}
 	}
 	logger.Log(0, "certificates/key saved ")
 	logger.Log(0, "certificates/key saved ")
-	return nil
+	return JoinNetwork(cfg, "", false)
 }
 }