speatzle/nfsense
1
0
Fork 0
mirror of https://github.com/speatzle/nfsense.git synced 2025-05-10 18:38:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix vlan template and data

Browse source
This commit is contained in:
Samuel Lorch 2023-04-08 14:51:03 +02:00
parent d6c58b7d21
commit fc49a2479e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/networkd/configuration.go
View file

@ -145,9 +145,13 @@ func GenerateNetworkdConfiguration(conf definitions.Config) ([]NetworkdConfigFil
slog.Info("Vlans on interface", "interface", name, "count", len(vlans)) slog.Info("Vlans on interface", "interface", name, "count", len(vlans))
if len(vlans) != 0 { if len(vlans) != 0 {
parentName := name
if inter.Type == definitions.Hardware {
parentName = *inter.HardwareDevice
}
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
err := templates.ExecuteTemplate(buf, "vlan-assignments.network.tmpl", VlanAssignments{ err := templates.ExecuteTemplate(buf, "vlan-assignments.network.tmpl", VlanAssignments{
Name: name, Name: parentName,
Vlans: vlans, Vlans: vlans,
}) })
if err != nil { if err != nil {

4
internal/networkd/template/vlan-assignments.network.tmpl
View file

@ -1,9 +1,5 @@
[Match] [Match]
{{- if eq .Type 0 }}
Name={{ .HardwareDevice }}
{{- else }}
Name={{ .Name }} Name={{ .Name }}
{{- end }}
[Network] [Network]
{{- range .Vlans }} {{- range .Vlans }}