From 2aa0a91dfc4a1283b445d229e52da19748c5e96d Mon Sep 17 00:00:00 2001 From: jbergner Date: Fri, 9 May 2025 11:52:43 +0200 Subject: [PATCH] DHCP-Domain --- main.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/main.go b/main.go index 2a3ad50..4cae7ba 100644 --- a/main.go +++ b/main.go @@ -50,6 +50,7 @@ var ( dhcpServer string dhcpScope string dhcpNamePrefix string + dhcpDomain string ) // --------------------------------------------------------------------------- @@ -63,11 +64,11 @@ type singleData struct { type addrPair struct{ Name, IPv4, IPv6 string } type rangeData struct { - Start, End string - DhcpServer, DhcpScope string - Rows []addrPair - Error string - HaveResult bool + Start, End string + DhcpServer, DhcpScope, DhcpDomain string + Rows []addrPair + Error string + HaveResult bool } // --------------------------------------------------------------------------- @@ -126,7 +127,7 @@ func handleRange(w http.ResponseWriter, r *http.Request) { startStr := r.FormValue("start") endStr := r.FormValue("end") rows, err := convertRange(startStr, endStr) - d := rangeData{Start: startStr, End: endStr, DhcpServer: dhcpServer, DhcpScope: dhcpScope} + d := rangeData{Start: startStr, End: endStr, DhcpServer: dhcpServer, DhcpScope: dhcpScope, DhcpDomain: dhcpDomain} if err != nil { d.Error = err.Error() } else { @@ -243,6 +244,7 @@ func initConfigAndTemplates() { dhcpScope = os.Getenv("DHCP_SCOPE") dhcpServer = os.Getenv("DHCP_SERVER") dhcpNamePrefix = os.Getenv("DHCP_NAME_PREFIX") + dhcpDomain = os.Getenv("DHCP_DOMAIN") // Range limit --------------------------------- if limStr := os.Getenv("RANGE_LIMIT"); limStr != "" { @@ -342,7 +344,7 @@ var rangePageHTML = ` {{if .HaveResult}} - {{range .Rows}}{{end}} + {{range .Rows}}{{end}}
IPv4IPv6DHCP-IPv4DHCP-IPv6
{{.IPv4}}{{.IPv6}}netsh DHCP Server {{$.DhcpServer}} Scope {{$.DhcpScope}} Add reservedip {{.IPv4}} "{{.Name}}.stadt-hilden.de" "" "DHCP"---
{{.IPv4}}{{.IPv6}}netsh DHCP Server {{$.DhcpServer}} Scope {{$.DhcpScope}} Add reservedip {{.IPv4}} "{{.Name}}.{{$.DhcpDomain}}" "" "DHCP"---
{{end}} {{if .Error}}

Fehler: {{.Error}}

{{end}}