reverting windows behavior

netclient/command/commands.go

@@ -48,11 +48,13 @@ func Join(cfg config.ClientConfig, privateKey string) error {
 		return err
 	}
 	ncutils.PrintLog("joined "+cfg.Network, 1)
-	if ncutils.IsWindows() {
-		ncutils.PrintLog("setting up WireGuard app", 0)
-		time.Sleep(time.Second >> 1)
-		functions.Pull(cfg.Network, true)
-	}
+	/*
+		if ncutils.IsWindows() {
+			ncutils.PrintLog("setting up WireGuard app", 0)
+			time.Sleep(time.Second >> 1)
+			functions.Pull(cfg.Network, true)
+		}
+	*/
 	return err
 }
 

netclient/ncutils/netclientutils.go

@@ -49,7 +49,7 @@ const LINUX_APP_DATA_PATH = "/etc/netclient"
 const WINDOWS_APP_DATA_PATH = "C:\\ProgramData\\Netclient"
 
 // WINDOWS_APP_DATA_PATH - windows path
-const WINDOWS_WG_DPAPI_PATH = "C:\\Program Files\\WireGuard\\Data\\Configurations"
+//const WINDOWS_WG_DPAPI_PATH = "C:\\Program Files\\WireGuard\\Data\\Configurations"
 
 // WINDOWS_SVC_NAME - service name
 const WINDOWS_SVC_NAME = "netclient"

netclient/wireguard/windows.go

@@ -2,23 +2,22 @@ package wireguard
 
 import (
 	"fmt"
-	"os"
-	"strings"
-	"time"
 
 	"github.com/gravitl/netmaker/netclient/ncutils"
 )
 
 // ApplyWindowsConf - applies the WireGuard configuration file on Windows
 func ApplyWindowsConf(confPath string) error {
-	pathStrings := strings.Split(confPath, ncutils.GetWGPathSpecific())
-	if len(pathStrings) == 2 {
-		copyConfPath := fmt.Sprintf("%s\\%s", ncutils.WINDOWS_WG_DPAPI_PATH, pathStrings[1])
-		err := ncutils.Copy(confPath, copyConfPath)
-		if err != nil {
-			ncutils.PrintLog(err.Error(), 1)
+	/*
+		pathStrings := strings.Split(confPath, ncutils.GetWGPathSpecific())
+		if len(pathStrings) == 2 {
+			copyConfPath := fmt.Sprintf("%s\\%s", ncutils.WINDOWS_WG_DPAPI_PATH, pathStrings[1])
+			err := ncutils.Copy(confPath, copyConfPath)
+			if err != nil {
+				ncutils.PrintLog(err.Error(), 1)
+			}
 		}
-	}
+	*/
 	var commandLine = fmt.Sprintf(`wireguard.exe /installtunnelservice "%s"`, confPath)
 	if _, err := ncutils.RunCmdFormatted(commandLine, false); err != nil {
 		return err
@@ -31,20 +30,22 @@ func RemoveWindowsConf(ifacename string, printlog bool) error {
 	if _, err := ncutils.RunCmd("wireguard.exe /uninstalltunnelservice "+ifacename, printlog); err != nil {
 		ncutils.PrintLog(err.Error(), 1)
 	}
-	dpapipath := fmt.Sprintf("%s\\%s.conf.dpapi", ncutils.WINDOWS_WG_DPAPI_PATH, ifacename)
-	confpath := fmt.Sprintf("%s\\%s.conf", ncutils.WINDOWS_WG_DPAPI_PATH, ifacename)
-	if ncutils.FileExists(confpath) {
-		err := os.Remove(confpath)
-		if err != nil {
-			ncutils.PrintLog(err.Error(), 1)
+	/*
+		dpapipath := fmt.Sprintf("%s\\%s.conf.dpapi", ncutils.WINDOWS_WG_DPAPI_PATH, ifacename)
+		confpath := fmt.Sprintf("%s\\%s.conf", ncutils.WINDOWS_WG_DPAPI_PATH, ifacename)
+		if ncutils.FileExists(confpath) {
+			err := os.Remove(confpath)
+			if err != nil {
+				ncutils.PrintLog(err.Error(), 1)
+			}
 		}
-	}
-	time.Sleep(time.Second >> 2)
-	if ncutils.FileExists(dpapipath) {
-		err := os.Remove(dpapipath)
-		if err != nil {
-			ncutils.PrintLog(err.Error(), 1)
+		time.Sleep(time.Second >> 2)
+		if ncutils.FileExists(dpapipath) {
+			err := os.Remove(dpapipath)
+			if err != nil {
+				ncutils.PrintLog(err.Error(), 1)
+			}
 		}
-	}
+	*/
 	return nil
 }