Merge pull request #590 from gravitl/develop

Develop

.github/workflows/buildandrelease.yml

@@ -7,7 +7,7 @@ on:
         description: 'Netmaker version'
         required: false
   release:
-    types: [created]
+    types: [published]
 
 jobs:
   build:

netclient/ncutils/netclientutils_darwin.go

@@ -35,7 +35,7 @@ func GetEmbedded() error {
 }
 
 // CreateWireGuardConf - creates a WireGuard conf string
-func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string, dns string, peers []wgtypes.PeerConfig) (string, error) {
+func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string, peers []wgtypes.PeerConfig) (string, error) {
 	peersString, err := parsePeers(node.PersistentKeepalive, peers)
 	var listenPortString string
 	if node.MTU <= 0 {

netclient/ncutils/netclientutils_freebsd.go

@@ -44,7 +44,7 @@ func RunCmd(command string, printerr bool) (string, error) {
 }
 
 // CreateWireGuardConf - creates a WireGuard conf string
-func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string, dns string, peers []wgtypes.PeerConfig) (string, error) {
+func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string, peers []wgtypes.PeerConfig) (string, error) {
 	peersString, err := parsePeers(node.PersistentKeepalive, peers)
 	var listenPortString string
 	if node.MTU <= 0 {

netclient/ncutils/netclientutils_windows.go

@@ -49,7 +49,7 @@ func RunCmdFormatted(command string, printerr bool) (string, error) {
 }
 
 // CreateWireGuardConf - creates a WireGuard conf string
-func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string, dns string, peers []wgtypes.PeerConfig) (string, error) {
+func CreateWireGuardConf(node *models.Node, privatekey string, listenPort string, peers []wgtypes.PeerConfig) (string, error) {
 	peersString, err := parsePeers(node.PersistentKeepalive, peers)
 	var listenPortString string
 	if node.MTU <= 0 {