Merge branch 'master' of github.com:gravitl/netmaker

This commit is contained in:
Matthew R Kasun 2022-01-06 16:17:16 -05:00
commit 4b65bb5f67
3 changed files with 3 additions and 3 deletions

View file

@ -35,7 +35,7 @@ func GetEmbedded() error {
} }
// CreateWireGuardConf - creates a WireGuard conf string // 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) peersString, err := parsePeers(node.PersistentKeepalive, peers)
var listenPortString string var listenPortString string
if node.MTU <= 0 { if node.MTU <= 0 {

View file

@ -44,7 +44,7 @@ func RunCmd(command string, printerr bool) (string, error) {
} }
// CreateWireGuardConf - creates a WireGuard conf string // 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) peersString, err := parsePeers(node.PersistentKeepalive, peers)
var listenPortString string var listenPortString string
if node.MTU <= 0 { if node.MTU <= 0 {

View file

@ -49,7 +49,7 @@ func RunCmdFormatted(command string, printerr bool) (string, error) {
} }
// CreateWireGuardConf - creates a WireGuard conf string // 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) peersString, err := parsePeers(node.PersistentKeepalive, peers)
var listenPortString string var listenPortString string
if node.MTU <= 0 { if node.MTU <= 0 {