added warewulfconf as command line parameter

the environment variable WAREWULFCONF is also recognized

Signed-off-by: Christian Goll <cgoll@suse.de>

internal/pkg/warewulfd/daemon.go

@@ -44,10 +44,7 @@ func DaemonInitLogging() error {
 		wwlog.SetLogLevel(wwlog.SERV)
 	}
 
-	conf, err := warewulfconf.New()
-	if err != nil {
-		return errors.Wrap(err, "Could not read Warewulf configuration file")
-	}
+	conf := warewulfconf.New()
 
 	if conf.Warewulf.Syslog {
 

internal/pkg/warewulfd/provision.go

@@ -31,12 +31,7 @@ type iPxeTemplate struct {
 }
 
 func ProvisionSend(w http.ResponseWriter, req *http.Request) {
-	conf, err := warewulfconf.New()
-	if err != nil {
-		wwlog.Error("Could not open Warewulf configuration: %s", err)
-		w.WriteHeader(http.StatusServiceUnavailable)
-		return
-	}
+	conf := warewulfconf.New()
 
 	rinfo, err := parseReq(req)
 	if err != nil {
@@ -45,7 +40,7 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	wwlog.Recv("hwaddr: %s, ipaddr: %s, stage: %s", rinfo.hwaddr, req.RemoteAddr, rinfo.stage )
+	wwlog.Recv("hwaddr: %s, ipaddr: %s, stage: %s", rinfo.hwaddr, req.RemoteAddr, rinfo.stage)
 
 	if rinfo.stage == "runtime" && conf.Warewulf.Secure {
 		if rinfo.remoteport >= 1024 {
@@ -56,11 +51,11 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 	}
 
 	status_stages := map[string]string{
-		"ipxe": "IPXE",
-		"kernel": "KERNEL",
-		"kmods": "KMODS_OVERLAY",
-		"system": "SYSTEM_OVERLAY",
-		"runtime": "RUNTIME_OVERLAY" }
+		"ipxe":    "IPXE",
+		"kernel":  "KERNEL",
+		"kmods":   "KMODS_OVERLAY",
+		"system":  "SYSTEM_OVERLAY",
+		"runtime": "RUNTIME_OVERLAY"}
 
 	status_stage := status_stages[rinfo.stage]
 	var stage_overlays []string
@@ -87,24 +82,24 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 		if rinfo.stage == "ipxe" {
 			stage_file = path.Join(buildconfig.SYSCONFDIR(), "/warewulf/ipxe/unconfigured.ipxe")
 			tmpl_data = iPxeTemplate{
-				Hwaddr : rinfo.hwaddr }
+				Hwaddr: rinfo.hwaddr}
 		}
 
-	}else if rinfo.stage == "ipxe" {
+	} else if rinfo.stage == "ipxe" {
 		stage_file = path.Join(buildconfig.SYSCONFDIR(), "warewulf/ipxe/"+node.Ipxe.Get()+".ipxe")
 		tmpl_data = iPxeTemplate{
-			Id : node.Id.Get(),
-			Cluster : node.ClusterName.Get(),
-			Fqdn : node.Id.Get(),
-			Ipaddr : conf.Ipaddr,
-			Port : strconv.Itoa(conf.Warewulf.Port),
-			Hostname : node.Id.Get(),
-			Hwaddr : rinfo.hwaddr,
-			ContainerName : node.ContainerName.Get(),
-			KernelArgs : node.Kernel.Args.Get(),
-			KernelOverride : node.Kernel.Override.Get() }
+			Id:             node.Id.Get(),
+			Cluster:        node.ClusterName.Get(),
+			Fqdn:           node.Id.Get(),
+			Ipaddr:         conf.Ipaddr,
+			Port:           strconv.Itoa(conf.Warewulf.Port),
+			Hostname:       node.Id.Get(),
+			Hwaddr:         rinfo.hwaddr,
+			ContainerName:  node.ContainerName.Get(),
+			KernelArgs:     node.Kernel.Args.Get(),
+			KernelOverride: node.Kernel.Override.Get()}
 
-	}else if rinfo.stage == "kernel" {
+	} else if rinfo.stage == "kernel" {
 		if node.Kernel.Override.Defined() {
 			stage_file = kernel.KernelImage(node.Kernel.Override.Get())
 		} else if node.ContainerName.Defined() {
@@ -117,28 +112,28 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 			wwlog.Warn("No kernel version set for node %s", node.Id.Get())
 		}
 
-	}else if rinfo.stage == "kmods" {
+	} else if rinfo.stage == "kmods" {
 		if node.Kernel.Override.Defined() {
 			stage_file = kernel.KmodsImage(node.Kernel.Override.Get())
-		}else{
+		} else {
 			wwlog.Warn("No kernel override modules set for node %s", node.Id.Get())
 		}
 
-	}else if rinfo.stage == "container" {
+	} else if rinfo.stage == "container" {
 		if node.ContainerName.Defined() {
 			stage_file = container.ImageFile(node.ContainerName.Get())
 		} else {
 			wwlog.Warn("No container set for node %s", node.Id.Get())
 		}
 
-	}else if rinfo.stage == "system" {
+	} else if rinfo.stage == "system" {
 		if len(node.SystemOverlay.GetSlice()) != 0 {
 			stage_overlays = node.SystemOverlay.GetSlice()
 		} else {
 			wwlog.Warn("No system overlay set for node %s", node.Id.Get())
 		}
 
-	}else if rinfo.stage == "runtime" {
+	} else if rinfo.stage == "runtime" {
 		if rinfo.overlay != "" {
 			stage_overlays = []string{rinfo.overlay}
 		} else if len(node.RuntimeOverlay.GetSlice()) != 0 {
@@ -153,7 +148,7 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 		stage_file, err = getOverlayFile(
 			node.Id.Get(),
 			stage_overlays,
-			conf.Warewulf.AutobuildOverlays )
+			conf.Warewulf.AutobuildOverlays)
 
 		if err != nil {
 			w.WriteHeader(http.StatusInternalServerError)
@@ -162,7 +157,7 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 		}
 	}
 
-	wwlog.Serv("stage_file '%s'", stage_file )
+	wwlog.Serv("stage_file '%s'", stage_file)
 
 	if util.IsFile(stage_file) {
 
@@ -200,7 +195,7 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 
 			wwlog.Send("%15s: %s", node.Id.Get(), stage_file)
 
-		}else{
+		} else {
 			if rinfo.compress == "gz" {
 				stage_file += ".gz"
 
@@ -210,7 +205,7 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 					w.WriteHeader(http.StatusNotFound)
 					return
 				}
-			}else if rinfo.compress != "" {
+			} else if rinfo.compress != "" {
 				wwlog.Error("unsupported %s compressed version of file %s",
 					rinfo.compress, stage_file)
 				w.WriteHeader(http.StatusNotFound)
@@ -225,14 +220,14 @@ func ProvisionSend(w http.ResponseWriter, req *http.Request) {
 
 		updateStatus(node.Id.Get(), status_stage, path.Base(stage_file), rinfo.ipaddr)
 
-	}else if stage_file == "" {
+	} else if stage_file == "" {
 		w.WriteHeader(http.StatusBadRequest)
 		wwlog.Error("No resource selected")
 		updateStatus(node.Id.Get(), status_stage, "BAD_REQUEST", rinfo.ipaddr)
 
-	}else{
+	} else {
 		w.WriteHeader(http.StatusNotFound)
-		wwlog.Error("Not found: %s", stage_file )
+		wwlog.Error("Not found: %s", stage_file)
 		updateStatus(node.Id.Get(), status_stage, "NOT_FOUND", rinfo.ipaddr)
 	}
 

internal/pkg/warewulfd/warewulfd.go

@@ -58,10 +58,7 @@ func RunServer() error {
 	http.HandleFunc("/overlay-runtime/", ProvisionSend)
 	http.HandleFunc("/status", StatusSend)
 
-	conf, err := warewulfconf.New()
-	if err != nil {
-		return errors.Wrap(err, "could not get Warewulf configuration")
-	}
+	conf := warewulfconf.New()
 
 	daemonPort := conf.Warewulf.Port
 	wwlog.Serv("Starting HTTPD REST service on port %d", daemonPort)