Update default warewulfd port to match initial configuration

We've been shipping a warewulf.conf that defines the warewulfd port as
9873, and a firewalld service that uses this port as well; but the
default value in the YAML data-structure has been 9983.

This changes the default port to 9873 to match the configuration we've
been shipping, and removes the port from the initial configuration file
(to use the default value).

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

CHANGELOG.md

@@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Changed `wwctl server` to use "INFO" for send and receive logs #725
 - Remove a 3-second sleep during iPXE boot. #1500
 - Don't package the API in RPM packages by default. #1493
+- Update default `warewulfd` port to match shipped configuration. #1448
 
 ### Removed
 

docs/man/man5/warewulf.conf.5

@@ -62,7 +62,7 @@ This is the port that the Warewulf web server will be listening on. It
 is recommended not to change this so there is no misalignment with
 node's expectations of how to contact the Warewulf service.
 
-Default: 9983
+Default: 9873
 .IP
 
 .TP

etc/warewulf.conf

@@ -3,7 +3,6 @@ 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

internal/pkg/config/buildconfig.go.in

@@ -38,7 +38,7 @@ type TFTPConf struct {
 // WarewulfConf adds additional Warewulf-specific configuration to
 // BaseConf.
 type WarewulfConf struct {
-	Port              int    `yaml:"port" default:"9983"`
+	Port              int    `yaml:"port" default:"9873"`
 	Secure            bool   `yaml:"secure" default:"true"`
 	UpdateInterval    int    `yaml:"update interval" default:"60"`
 	AutobuildOverlays bool   `yaml:"autobuild overlays" default:"true"`

internal/pkg/config/root_test.go

@@ -10,7 +10,7 @@ import (
 func TestDefaultRootConf(t *testing.T) {
 	conf := New()
 
-	assert.Equal(t, 9983, conf.Warewulf.Port)
+	assert.Equal(t, 9873, conf.Warewulf.Port)
 	assert.True(t, conf.Warewulf.Secure)
 	assert.Equal(t, 60, conf.Warewulf.UpdateInterval)
 	assert.True(t, conf.Warewulf.AutobuildOverlays)
@@ -155,8 +155,8 @@ func TestCache(t *testing.T) {
 	confOrig := New()
 	confCached := Get()
 
-	assert.Equal(t, 9983, confOrig.Warewulf.Port)
-	assert.Equal(t, 9983, confCached.Warewulf.Port)
+	assert.Equal(t, 9873, confOrig.Warewulf.Port)
+	assert.Equal(t, 9873, confCached.Warewulf.Port)
 
 	confOrig.Warewulf.Port = 9999
 	assert.Equal(t, 9999, confCached.Warewulf.Port)

overlays/debug/internal/debug_test.go

@@ -172,7 +172,7 @@ data from other structures.
 
 ### Warewulf
 
-- Port: 9983
+- Port: 9873
 - Secure: true
 - UpdateInterval: 60
 - AutobuildOverlays: true