From 351d5dbf0ae682f0332e2af3b177422b1b976fc6 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 24 Aug 2022 03:58:09 -0600 Subject: [PATCH] More generic defaults for warewulf.conf Signed-off-by: Jonathon Anderson --- internal/pkg/warewulfconf/datastructure.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/pkg/warewulfconf/datastructure.go b/internal/pkg/warewulfconf/datastructure.go index 887d11ef..ef43a2ae 100644 --- a/internal/pkg/warewulfconf/datastructure.go +++ b/internal/pkg/warewulfconf/datastructure.go @@ -35,8 +35,8 @@ type WarewulfConf struct { type DhcpConf struct { Enabled bool `yaml:"enabled" default:"true"` Template string `yaml:"template" default:"default"` - RangeStart string `yaml:"range start" default:"192.168.200.50"` - RangeEnd string `yaml:"range end" default:"192.168.200.99"` + RangeStart string `yaml:"range start,omitempty"` + RangeEnd string `yaml:"range end,omitempty"` SystemdName string `yaml:"systemd name" default:"dhcpd"` } @@ -48,12 +48,12 @@ type TftpConf struct { type NfsConf struct { Enabled bool `yaml:"enabled" default:"true"` - ExportsExtended []*NfsExportConf `yaml:"export paths" default:"[{\"Path\": \"home\"}]"` + ExportsExtended []*NfsExportConf `yaml:"export paths" default:"[]"` SystemdName string `yaml:"systemd name" default:"nfsd"` } type NfsExportConf struct { - Path string `yaml:"path" default:"/home"` + 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"`