WIP

Signed-off-by: Alejandro Mery <amery@jpi.io>

pkg/zones/machine.go

@@ -58,7 +58,7 @@ func (m *Machine) SetGateway(enabled bool) error {
 	}
 
 	ri.Enabled = enabled
-	return m.syncRingConfig(0)
+	return m.SyncWireguardConfig(0)
 }
 
 func (m *Machine) getPeerByName(name string) (*Machine, bool) {

pkg/zones/machine_rings.go

@@ -262,9 +262,10 @@ func (m *Machine) RemoveWireguardConfig(ring int) error {
 	return err
 }
 
-func (*Machine) syncRingConfig(_ int) error {
-	// _, err := m.getRingNodes(ring)
-	return nil
+// SyncWireguardConfig updates all wgN.conf files for the specified
+// ring
+func (m *Machine) SyncWireguardConfig(ring int) error {
+	return m.zone.SyncWireguardConfig(ring)
 }
 
 func (m *Machine) createRingInfo(ring int, enabled bool) (*RingInfo, error) {
@@ -286,32 +287,3 @@ func (m *Machine) createRingInfo(ring int, enabled bool) (*RingInfo, error) {
 
 	return ri, nil
 }
-
-func (m *Machine) writeRingInfo(ri *RingInfo) error {
-	var err error
-
-	if m == nil || ri == nil {
-		return fs.ErrInvalid
-	}
-
-	err = m.WriteWireguardKeys(ri.Ring)
-	if err != nil {
-		return err
-	}
-
-	if !ri.Enabled {
-		return m.RemoveWireguardConfig(ri.Ring)
-	}
-
-	return m.writeRingInfoConf(ri.Ring, ri.Keys.PrivateKey)
-}
-
-func (m *Machine) writeRingInfoConf(ring int, _ wireguard.PrivateKey) error {
-	f, err := m.CreateTruncFile("wg%v.conf", ring)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	return nil
-}

pkg/zones/zone_rings.go

@@ -0,0 +1,23 @@
+package zones
+
+// SyncWireguardConfig updates all wgN.conf files for the specified
+// ring
+func (z *Zone) SyncWireguardConfig(ring int) error {
+	return z.PruneWireguardConfig(ring)
+}
+
+// PruneWireguardConfig removes wgN.conf files of machines with
+// the corresponding ring disabled.
+func (z *Zone) PruneWireguardConfig(ring int) error {
+	var err error
+
+	z.ForEachMachine(func(p *Machine) bool {
+		_, ok := p.getRingInfo(ring)
+		if !ok {
+			err = p.RemoveWireguardConfig(ring)
+		}
+		return err != nil
+	})
+
+	return err
+}