0b3e862bea
I noticed that some wwlog calls included a trailing newline, but others did not. I tested both in isolation and discovered that the behavior was consistent regardless of whether a trailing newline was included. I further confirmed in code that wwlog appends a trailing newline automatically if it is not present; so a trailing newline is unnecessary in individual calls. This commit removes trailing newlines from all calls to make them consistent. It also replaces two calls to wwlog.Printf. (see #534) Signed-off-by: Jonathon Anderson <janderson@ciq.co>
85 lines
2.7 KiB
Go
85 lines
2.7 KiB
Go
package warewulfconf
|
|
|
|
import (
|
|
"github.com/creasty/defaults"
|
|
"github.com/hpcng/warewulf/internal/pkg/util"
|
|
"github.com/hpcng/warewulf/internal/pkg/wwlog"
|
|
)
|
|
|
|
type ControllerConf struct {
|
|
WWInternal int `yaml:"WW_INTERNAL"`
|
|
Comment string `yaml:"comment,omitempty"`
|
|
Ipaddr string `yaml:"ipaddr"`
|
|
Ipaddr6 string `yaml:"ipaddr6,omitempty"`
|
|
Netmask string `yaml:"netmask"`
|
|
Network string `yaml:"network,omitempty"`
|
|
Ipv6net string `yaml:"ipv6net,omitempty"`
|
|
Fqdn string `yaml:"fqdn,omitempty"`
|
|
Warewulf *WarewulfConf `yaml:"warewulf"`
|
|
Dhcp *DhcpConf `yaml:"dhcp"`
|
|
Tftp *TftpConf `yaml:"tftp"`
|
|
Nfs *NfsConf `yaml:"nfs"`
|
|
current bool
|
|
}
|
|
|
|
type WarewulfConf struct {
|
|
Port int `yaml:"port" default:"9983"`
|
|
Secure bool `yaml:"secure" default:"true"`
|
|
UpdateInterval int `yaml:"update interval" default:"60"`
|
|
AutobuildOverlays bool `yaml:"autobuild overlays" default:"true"`
|
|
EnableHostOverlay bool `yaml:"host overlay" default:"true"`
|
|
Syslog bool `yaml:"syslog" default:"false"`
|
|
DataStore string `yaml:"datastore" default:"/var/lib/warewulf"`
|
|
}
|
|
|
|
type DhcpConf struct {
|
|
Enabled bool `yaml:"enabled" default:"true"`
|
|
Template string `yaml:"template" default:"default"`
|
|
RangeStart string `yaml:"range start,omitempty"`
|
|
RangeEnd string `yaml:"range end,omitempty"`
|
|
SystemdName string `yaml:"systemd name" default:"dhcpd"`
|
|
}
|
|
|
|
type TftpConf struct {
|
|
Enabled bool `yaml:"enabled" default:"true"`
|
|
TftpRoot string `yaml:"tftproot" default:"/var/lib/tftpboot"`
|
|
SystemdName string `yaml:"systemd name" default:"tftp"`
|
|
}
|
|
|
|
type NfsConf struct {
|
|
Enabled bool `yaml:"enabled" default:"true"`
|
|
ExportsExtended []*NfsExportConf `yaml:"export paths" default:"[]"`
|
|
SystemdName string `yaml:"systemd name" default:"nfsd"`
|
|
}
|
|
|
|
type NfsExportConf struct {
|
|
Path string `yaml:"path" default:"/dev/null"`
|
|
ExportOptions string `default:"rw,sync,no_subtree_check" yaml:"export options"`
|
|
MountOptions string `default:"defaults" yaml:"mount options"`
|
|
Mount bool `default:"true" yaml:"mount"`
|
|
}
|
|
|
|
func (s *NfsConf) Unmarshal(unmarshal func(interface{}) error) error {
|
|
if err := defaults.Set(s); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func init() {
|
|
if !util.IsFile(ConfigFile) {
|
|
wwlog.Error("Configuration file not found: %s", ConfigFile)
|
|
// fail silently as this also called by bash_completion
|
|
}
|
|
_, err := New()
|
|
if err != nil {
|
|
wwlog.Error("Could not read Warewulf configuration file: %s", err)
|
|
}
|
|
}
|
|
|
|
// Waste processor cycles to make code more readable
|
|
|
|
func DataStore() string {
|
|
return cachedConf.Warewulf.DataStore
|
|
}
|