added warewuld configure option

Co-authored-by: Jonathon Anderson <janderson@ciq.com>
Signed-off-by: Jonathon Anderson <janderson@ciq.com>

internal/pkg/config/buildconfig.go.in

@@ -40,12 +40,13 @@ func (conf TFTPConf) Enabled() bool {
 // WarewulfConf adds additional Warewulf-specific configuration to
 // BaseConf.
 type WarewulfConf struct {
-	Port               int   `yaml:"port,omitempty" default:"9873"`
-	SecureP            *bool `yaml:"secure,omitempty" default:"true"`
-	UpdateInterval     int   `yaml:"update interval,omitempty" default:"60"`
-	AutobuildOverlaysP *bool `yaml:"autobuild overlays,omitempty" default:"true"`
-	EnableHostOverlayP *bool `yaml:"host overlay,omitempty" default:"true"`
-	GrubBootP          *bool `yaml:"grubboot,omitempty" default:"false"`
+	Port               int    `yaml:"port,omitempty" default:"9873"`
+	SecureP            *bool  `yaml:"secure,omitempty" default:"true"`
+	UpdateInterval     int    `yaml:"update interval,omitempty" default:"60"`
+	AutobuildOverlaysP *bool  `yaml:"autobuild overlays,omitempty" default:"true"`
+	EnableHostOverlayP *bool  `yaml:"host overlay,omitempty" default:"true"`
+	GrubBootP          *bool  `yaml:"grubboot,omitempty" default:"false"`
+	SystemdName        string `yaml:"systemd name,omitempty"`
 }
 
 func (conf WarewulfConf) Secure() bool {

internal/pkg/configure/warewulfd.go

@@ -0,0 +1,22 @@
+package configure
+
+import (
+	warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
+	"github.com/warewulf/warewulf/internal/pkg/util"
+	"github.com/warewulf/warewulf/internal/pkg/wwlog"
+)
+
+func WAREWULFD() (err error) {
+	controller := warewulfconf.Get()
+	if controller.Warewulf.SystemdName != "" {
+		wwlog.Info("Enabling and restarting the Warewulf server")
+		err = util.SystemdStart(controller.Warewulf.SystemdName)
+		if err != nil {
+			return err
+		}
+	} else {
+		wwlog.Warn("Not (re)starting Warewulf server: no systemd name configured")
+	}
+
+	return nil
+}

internal/pkg/upgrade/config.go

@@ -97,6 +97,7 @@ type WarewulfConf struct {
 	Syslog            *bool  `yaml:"syslog"`
 	DataStore         string `yaml:"datastore"`
 	GrubBoot          *bool  `yaml:"grubboot"`
+	SystemdName       string `yaml:"systemd name"`
 }
 
 func (legacy *WarewulfConf) Upgrade() (upgraded *config.WarewulfConf) {
@@ -110,6 +111,7 @@ func (legacy *WarewulfConf) Upgrade() (upgraded *config.WarewulfConf) {
 		wwlog.Warn("syslog configuration ignored: all logs now go to stdout/stderr")
 	}
 	upgraded.GrubBootP = legacy.GrubBoot
+	upgraded.SystemdName = legacy.SystemdName
 	return upgraded
 }
 

internal/pkg/upgrade/config_test.go

@@ -483,6 +483,103 @@ image mounts:
     readonly: true
 paths:
   datadir: /usr/share
+`,
+	},
+	{
+		name: "v4.6.3",
+		legacyYaml: `
+ipaddr: 10.0.0.1
+netmask: 255.255.252.0
+network: 10.0.0.0
+warewulf:
+  port: 9873
+  secure: false
+  update interval: 60
+  autobuild overlays: true
+  host overlay: true
+  syslog: false
+  datastore: /usr/share
+  systemd name: warewulfd
+dhcp:
+  enabled: true
+  range start: 10.0.1.1
+  range end: 10.0.1.255
+  systemd name: dhcpd
+tftp:
+  enabled: true
+  systemd name: tftp
+  ipxe:
+    00:0B: arm64-efi/snponly.efi
+    "00:00": undionly.kpxe
+    "00:07": ipxe-snponly-x86_64.efi
+    "00:09": ipxe-snponly-x86_64.efi
+nfs:
+  enabled: true
+  export paths:
+    - path: /home
+      export options: rw,sync
+      mount options: defaults
+      mount: true
+    - path: /opt
+      export options: ro,sync,no_root_squash
+      mount options: defaults
+      mount: false
+  systemd name: nfs-server
+ssh:
+  key types:
+    - rsa
+    - dsa
+    - ecdsa
+    - ed25519
+container mounts:
+  - source: /etc/resolv.conf
+    dest: /etc/resolv.conf
+    readonly: true
+`,
+		upgradedYaml: `
+ipaddr: 10.0.0.1
+netmask: 255.255.252.0
+network: 10.0.0.0
+warewulf:
+  port: 9873
+  secure: false
+  update interval: 60
+  autobuild overlays: true
+  host overlay: true
+  systemd name: warewulfd
+dhcp:
+  enabled: true
+  range start: 10.0.1.1
+  range end: 10.0.1.255
+  systemd name: dhcpd
+tftp:
+  enabled: true
+  systemd name: tftp
+  ipxe:
+    00:0B: arm64-efi/snponly.efi
+    "00:00": undionly.kpxe
+    "00:07": ipxe-snponly-x86_64.efi
+    "00:09": ipxe-snponly-x86_64.efi
+nfs:
+  enabled: true
+  export paths:
+    - path: /home
+      export options: rw,sync
+    - path: /opt
+      export options: ro,sync,no_root_squash
+  systemd name: nfs-server
+ssh:
+  key types:
+    - rsa
+    - dsa
+    - ecdsa
+    - ed25519
+image mounts:
+  - source: /etc/resolv.conf
+    dest: /etc/resolv.conf
+    readonly: true
+paths:
+  datadir: /usr/share
 `,
 	},
 }