lourenco/mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modules: meta: Move router to networkd

Browse Source 
I can't get NetworkManager working properly in parallel to wireguard. I
get an extra route added and it breaks the tunnel. No idea why. The
networkd equivalent seems to just work.
This commit is contained in:
James Shubin
2025-06-02 15:17:28 -04:00
parent c51a55e98a
commit a72492f042
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
modules/meta/router.mcl
View File

@@ -38,10 +38,12 @@ class router($st) {
$net_dev = $st->net_dev || "eth0" $net_dev = $st->net_dev || "eth0"
$net_mac = $st->net_mac $net_mac = $st->net_mac
#$net_uuid = $st->net_uuid || "" # 01234567-89ab-cdef-0123-456789abcdef
$loc_dev = $st->loc_dev || "" $loc_dev = $st->loc_dev || ""
$loc_mac = $st->loc_mac || "" $loc_mac = $st->loc_mac || ""
$loc_uuid = $st->loc_uuid || "" # 01234567-89ab-cdef-0123-456789abcdef #$loc_uuid = $st->loc_uuid || "" # 01234567-89ab-cdef-0123-456789abcdef
$loc_network = $st->loc_network # cidr $loc_network = $st->loc_network # cidr
$loc_ip = $st->loc_ip || net.cidr_to_first($loc_network) # no cidr $loc_ip = $st->loc_ip || net.cidr_to_first($loc_network) # no cidr
@@ -50,19 +52,42 @@ class router($st) {
$loc_range = $st->loc_range || struct{start => "", end => "",} # struct with start, end fields $loc_range = $st->loc_range || struct{start => "", end => "",} # struct with start, end fields
$dns = $st->dns $dns = $st->dns
svc "NetworkManager" {
state => "stopped",
startup => "disabled",
}
include misc.network_rename($net_mac, $net_dev) include misc.network_rename($net_mac, $net_dev)
if $loc_dev != "" and $loc_mac != "" { if $loc_dev != "" and $loc_mac != "" {
include misc.network_rename($loc_mac, $loc_dev) include misc.network_rename($loc_mac, $loc_dev)
} }
if $loc_dev != "" { if $net_dev != "" {
$prefix = net.cidr_to_prefix($loc_network) # XXX: should we specify DNS here?
include misc.network_manager_static(struct{ include misc.networkd_dhcp($net_dev, struct{
uuid => $loc_uuid,
dev => $loc_dev, # formerly enp0s2
cidr => "${loc_ip}/${prefix}",
dns => $dns, dns => $dns,
}) })
#include misc.network_manager_dhcp(struct{
# uuid => $net_uuid,
# dev => $net_dev,
# mac => $net_mac,
# dns => $dns,
#})
}
if $loc_dev != "" {
$prefix = net.cidr_to_prefix($loc_network)
include misc.networkd_static($net_dev, struct{
cidr => "${loc_ip}/${prefix}",
#dns => $dns,
})
#include misc.network_manager_static(struct{
# uuid => $loc_uuid,
# dev => $loc_dev, # formerly enp0s2
# mac => $loc_mac,
# cidr => "${loc_ip}/${prefix}",
# dns => $dns,
#})
} }
include purpleidea.base() # adds some utility packages include purpleidea.base() # adds some utility packages