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>
This commit is contained 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"`
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user