Revert "Move configuration code out of wwctl"

2022-02-11 16:20:05 -08:00
parent 5a7f99af18
commit 67ee3bf5f8
33 changed files with 685 additions and 683 deletions
--- a/Defaults.mk.in
+++ b/Defaults.mk.in
@@ -0,0 +1,13 @@
+VERSION ?= @VERSION@
+RELEASE ?= @RELEASE@
+PREFIX ?= @PREFIX@
+BINDIR ?= @BINDIR@
+SYSCONFDIR ?= @SYSCONFDIR@
+SRVDIR ?= @SRVDIR@
+DATADIR ?= @DATADIR@
+MANDIR ?= @MANDIR@
+LOCALSTATEDIR ?= @LOCALSTATEDIR@
+TFTPDIR ?= @TFTPDIR@
+FIREWALLDDIR ?= @FIREWALLDDIR@
+SYSTEMDDIR ?= @SYSTEMDDIR@
+BASH_COMPLETION ?= @BASH_COMPLETION@
--- a/163
+++ b/163
@@ -1,63 +1,39 @@
 .PHONY: all

-# Linux distro (set to /etc/os-release ID)
-OS ?= rocky
-
-# List of variables to save or replace in files
-VARLIST := OS
-
 -include Defaults.mk

-# Project Information
-VARLIST += WAREWULF VERSION RELEASE
-WAREWULF ?= warewulf
 VERSION ?= 4.2.0
 GIT_TAG := $(shell test -e .git && git describe --tags --long --first-parent --always)

 ifndef $(GIT_TAG)
-  ifdef $(filter $(OS),ubuntu debian)
-    RELEASE ?= 1.git_$(subst -,+,$(GIT_TAG))
-  else
-    RELEASE ?= 1.git_$(subst -,_,$(GIT_TAG))
-  endif
+    RELEASE ?= 1.git_$(GIT_TAG)
 else
-  RELEASE ?= 1
+	RELEASE ?= 1
 endif

-# System directory paths
-VARLIST += PREFIX BINDIR SYSCONFDIR SRVDIR DATADIR MANDIR DOCDIR LOCALSTATEDIR SHAREDSTATEDIR
+# System locations
 PREFIX ?= /usr/local
 BINDIR ?= $(PREFIX)/bin
 SYSCONFDIR ?= $(PREFIX)/etc
-SRVDIR ?= /srv
+SRVDIR ?= $(PREFIX)/srv
 DATADIR ?= $(PREFIX)/share
 MANDIR ?= $(DATADIR)/man
-DOCDIR ?= $(DATADIR)/doc
-LOCALSTATEDIR ?= /var
-SHAREDSTATEDIR ?= /var/local
+LOCALSTATEDIR ?= $(PREFIX)/var
+WWCLIENTLOC ?= /warewulf/bin

-# OS-Specific Service Locations
-VARLIST += TFTPDIR FIREWALLDDIR SYSTEMDDIR
-ifeq ($(OS),suse)
-TFTPDIR ?= /srv/tftpboot
-endif
-ifeq ($(OS),ubuntu)
-TFTPDIR ?= /srv/tftp
-endif
 TFTPDIR ?= /var/lib/tftpboot
 FIREWALLDDIR ?= /usr/lib/firewalld/services
 SYSTEMDDIR ?= /usr/lib/systemd/system
-BASHCOMPDIR ?= /etc/bash_completion.d
+BASH_COMPLETION ?= /etc/bash_completion.d/

-# Warewulf directory paths
-VARLIST += WWCLIENTDIR WWCONFIGDIR  WWPROVISIONDIR WWOVERLAYDIR WWCHROOTDIR WWTFTPDIR WWDOCDIR
-WWCONFIGDIR := $(SYSCONFDIR)/$(WAREWULF)
-WWPROVISIONDIR := $(SHAREDSTATEDIR)/$(WAREWULF)
-WWOVERLAYDIR := $(SHAREDSTATEDIR)/$(WAREWULF)/overlays
-WWCHROOTDIR := $(SHAREDSTATEDIR)/$(WAREWULF)/chroots
-WWTFTPDIR := $(TFTPDIR)/$(WAREWULF)
-WWDOCDIR := $(DOCDIR)/$(WAREWULF)
-WWCLIENTDIR ?= /warewulf
+# Warewulf locations
+WWPROVISIONDIR = $(SRVDIR)/warewulf
+WWOVERLAYDIR = $(LOCALSTATEDIR)/warewulf/overlays
+WWCHROOTDIR = $(LOCALSTATEDIR)/warewulf/chroots
+
+# SuSE
+#TFTPDIR ?= /srv/tftpboot
+#FIREWALLDIR ?= /srv/tftp

 # auto installed tooling
 TOOLS_DIR := .tools
@@ -75,7 +51,7 @@ GOPROXY ?= https://proxy.golang.org
 export GOPROXY

 # built tags needed for wwbuild binary
-WW_GO_BUILD_TAGS := containers_image_openpgp containers_image_ostree
+WW_BUILD_GO_BUILD_TAGS := containers_image_openpgp containers_image_ostree

 all: config vendor wwctl wwclient bash_completion.d man_pages

@@ -92,8 +68,10 @@ $(GO_TOOLS_BIN):
 $(GOLANGCI_LINT):
 	@curl -qq -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_LINT_VERSION)

+
 setup: vendor $(TOOLS_DIR) setup_tools

+# vendor
 vendor:
 	go mod tidy -v
 	go mod vendor
@@ -103,11 +81,27 @@ $(TOOLS_DIR):

 # Pre-build steps for source, such as "go generate"
 config:
-    # Store configuration for subsequent runs
-	printf " $(foreach V,$(VARLIST),$V := $(strip $($V))\n)" > Defaults.mk
-    # Global variable search and replace for all *.in files
-	find . -type f -name "*.in" -not -path "./vendor/*" \
-		-exec sh -c 'sed -ne "$(foreach V,$(VARLIST),s,@$V@,$(strip $($V)),g;)p" $${0} > $${0%.in}' {} \;
+	set -x ;\
+	for i in `find . -type f -name "*.in" -not -path "./vendor/*"`; do \
+		NAME=`echo $$i | sed -e 's,\.in,,'`; \
+		sed -e 's,@BINDIR@,$(BINDIR),g' \
+			-e 's,@SYSCONFDIR@,$(SYSCONFDIR),g' \
+			-e 's,@LOCALSTATEDIR@,$(LOCALSTATEDIR),g' \
+			-e 's,@PREFIX@,$(PREFIX),g' \
+			-e 's,@DATADIR@,$(DATADIR),g' \
+			-e 's,@MANDIR@,$(MANDIR),g' \
+			-e 's,@SRVDIR@,$(SRVDIR),g' \
+			-e 's,@TFTPDIR@,$(TFTPDIR),g' \
+			-e 's,@FIREWALLDDIR@,$(FIREWALLDDIR),g' \
+			-e 's,@SYSTEMDDIR@,$(SYSTEMDDIR),g' \
+			-e 's,@BASH_COMPLETION@,$(BASH_COMPLETION),g' \
+			-e 's,@WWOVERLAYDIR@,$(WWOVERLAYDIR),g' \
+			-e 's,@WWCHROOTDIR@,$(WWCHROOTDIR),g' \
+			-e 's,@WWPROVISIONDIR@,$(WWPROVISIONDIR),g' \
+			-e 's,@VERSION@,$(VERSION),g' \
+			-e 's,@WWCLIENTLOC@,$(WWCLIENTLOC),g' \
+			-e 's,@RELEASE@,$(RELEASE),g' $$i > $$NAME; \
+	done
 	touch config

 rm_config:
@@ -115,10 +109,11 @@ rm_config:

 genconfig: rm_config config

+
 # Lint
 lint: setup_tools
 	@echo Running golangci-lint...
-	@$(GOLANGCI_LINT) run --build-tags "$(WW_GO_BUILD_TAGS)" --skip-dirs internal/pkg/staticfiles ./...
+	@$(GOLANGCI_LINT) run --build-tags "$(WW_BUILD_GO_BUILD_TAGS)" --skip-dirs internal/pkg/staticfiles ./...

 vet:
 	go vet ./...
@@ -142,86 +137,98 @@ files: all
 	install -d -m 0755 $(DESTDIR)$(BINDIR)
 	install -d -m 0755 $(DESTDIR)$(WWCHROOTDIR)
 	install -d -m 0755 $(DESTDIR)$(WWPROVISIONDIR)
-	install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)
-	install -d -m 0755 $(DESTDIR)$(WWCONFIGDIR)/ipxe
-	install -d -m 0755 $(DESTDIR)$(WWTFTPDIR)/ipxe/
-	install -d -m 0755 $(DESTDIR)$(BASHCOMPDIR)
+	install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)
+	install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/bin/
+	install -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/warewulf/
+	install -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/warewulf/ipxe
+	install -d -m 0755 $(DESTDIR)$(TFTPDIR)/warewulf/ipxe/
+	install -d -m 0755 $(DESTDIR)$(BASH_COMPLETION)
 	install -d -m 0755 $(DESTDIR)$(MANDIR)/man1
-	install -d -m 0755 $(DESTDIR)$(WWDOCDIR)
 	install -d -m 0755 $(DESTDIR)$(FIREWALLDDIR)
 	install -d -m 0755 $(DESTDIR)$(SYSTEMDDIR)
-	test -f $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf || install -m 644 etc/warewulf.conf $(DESTDIR)$(WWCONFIGDIR)
-	test -f $(DESTDIR)$(WWCONFIGDIR)/hosts.tmpl || install -m 644 etc/hosts.tmpl $(DESTDIR)$(WWCONFIGDIR)
-	test -f $(DESTDIR)$(WWCONFIGDIR)/nodes.conf || install -m 644 etc/nodes.conf $(DESTDIR)$(WWCONFIGDIR)
-	cp -r etc/dhcp $(DESTDIR)$(WWCONFIGDIR)/
-	cp -r etc/ipxe $(DESTDIR)$(WWCONFIGDIR)/
-	cp -r overlays/wwinit $(DESTDIR)$(WWOVERLAYDIR)/
-	cp -r overlays/generic $(DESTDIR)$(WWOVERLAYDIR)/
-	cp -r overlays/wwclient/* $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)/
+	test -f $(DESTDIR)$(SYSCONFDIR)/warewulf/warewulf.conf || install -m 644 etc/warewulf.conf $(DESTDIR)$(SYSCONFDIR)/warewulf/
+	test -f $(DESTDIR)$(SYSCONFDIR)/warewulf/hosts.tmpl || install -m 644 etc/hosts.tmpl $(DESTDIR)$(SYSCONFDIR)/warewulf/
+	test -f $(DESTDIR)$(SYSCONFDIR)/warewulf/nodes.conf || install -m 644 etc/nodes.conf $(DESTDIR)$(SYSCONFDIR)/warewulf/
+	cp -r etc/dhcp $(DESTDIR)$(SYSCONFDIR)/warewulf/
+	cp -r etc/ipxe $(DESTDIR)$(SYSCONFDIR)/warewulf/
+	cp -r overlays/* $(DESTDIR)$(WWOVERLAYDIR)/
 	chmod 755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/init
-	rm -f $(DESTDIR)$(WWOVERLAYDIR)/wwinit/init.in
-	find $(DESTDIR)$(WWOVERLAYDIR) -type f -name "*.in" -exec rm -f {} \;
-	chmod 755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)/wwinit
+	chmod 755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/wwinit
 	chmod 600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*
 	chmod 644 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*.pub.ww
 	install -m 0755 wwctl $(DESTDIR)$(BINDIR)
-	install -m 0644 include/firewalld/warewulf.xml $(DESTDIR)$(FIREWALLDDIR)
-	install -m 0644 include/systemd/warewulfd.service $(DESTDIR)$(SYSTEMDDIR)
-	install -m 0644 LICENSE.md $(DESTDIR)$(WWDOCDIR)
-	cp bash_completion.d/warewulf $(DESTDIR)$(BASHCOMPDIR)
+	install -c -m 0644 include/firewalld/warewulf.xml $(DESTDIR)$(FIREWALLDDIR)
+	install -c -m 0644 include/systemd/warewulfd.service $(DESTDIR)$(SYSTEMDDIR)
+	cp bash_completion.d/warewulf $(DESTDIR)$(BASH_COMPLETION)
 	cp man_pages/* $(DESTDIR)$(MANDIR)/man1/

 init:
 	systemctl daemon-reload
-	cp -r tftpboot/* $(WWTFTPDIR)/ipxe/
-	restorecon -r $(WWTFTPDIR)
+	cp -r tftpboot/* $(TFTPDIR)/warewulf/ipxe/
+	restorecon -r $(TFTPDIR)/warewulf
+
+# Overlay file system has changed
+#debfiles: debian
+#	chmod +x $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/init
+#	chmod 600 $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/etc/ssh/ssh*
+#	chmod 644 $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/etc/ssh/ssh*.pub.ww
+#	mkdir -p $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/warewulf/bin/
+#	cp wwclient $(DESTDIR)$(WWROOT)/warewulf/overlays/system/debian/warewulf/bin/

 wwctl:
-	cd cmd/wwctl; GOOS=linux go build -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../wwctl
+	cd cmd/wwctl; GOOS=linux go build -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../wwctl

 wwclient:
 	cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags "-extldflags -static \
 	 -X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=/etc/warewulf/warewulf.conf'" -o ../../wwclient

 install_wwclient: wwclient
-	install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTDIR)/wwclient
+	install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/$(WWCLIENTLOC)/wwclient
+

 bash_completion:
 	cd cmd/bash_completion && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=./etc/warewulf.conf'\
 	 -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf'"\
-	 -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../bash_completion
+	 -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../bash_completion

 bash_completion.d: bash_completion
 	install -d -m 0755 bash_completion.d
-	./bash_completion bash_completion.d/warewulf
+	./bash_completion  bash_completion.d/warewulf

 man_page:
 	cd cmd/man_page && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=./etc/warewulf.conf'\
 	 -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf'"\
-	 -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../man_page
+	 -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../man_page

 man_pages: man_page
 	install -d man_pages
 	./man_page ./man_pages
 	cd man_pages; for i in wwctl*1; do echo "Compressing manpage: $$i"; gzip --force $$i; done

+#config_defaults:
+#	cd cmd/config_defaults && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=./etc/warewulf.conf' \
+#	 -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf' \
+#	 -X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.defaultDataStore=$(WWROOT)/warewulf'" \
+#	 -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../config_defaults
+
 dist: vendor config
-	rm -rf .dist/$(WAREWULF)-$(VERSION)
-	mkdir -p .dist/$(WAREWULF)-$(VERSION)
-	cp -rap * .dist/$(WAREWULF)-$(VERSION)/
-	cd .dist; tar -czf ../$(WAREWULF)-$(VERSION).tar.gz $(WAREWULF)-$(VERSION)
+	rm -rf .dist/warewulf-$(VERSION)
+	mkdir -p .dist/warewulf-$(VERSION)
+	cp -rap * .dist/warewulf-$(VERSION)/
+	cd .dist; tar -czf ../warewulf-$(VERSION).tar.gz warewulf-$(VERSION)
 	rm -rf .dist

 clean:
 	rm -f wwclient
 	rm -f wwctl
 	rm -rf .dist
-	rm -f $(WAREWULF)-$(VERSION).tar.gz
+	rm -f warewulf-$(VERSION).tar.gz
 	rm -f bash_completion
 	rm -rf bash_completion.d
 	rm -f man_page
 	rm -rf man_pages
 	rm -rf vendor
+#	rm -f config_defaults
 	rm -f config
 	rm -f Defaults.mk

--- a/internal/app/wwclient/root.go
+++ b/internal/app/wwclient/root.go
@@ -10,7 +10,6 @@ import (
 	"os"
 	"os/exec"
 	"os/signal"
-	"path"
 	"strings"
 	"syscall"
 	"time"
@@ -63,10 +62,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		return errors.New("found pidfile " + PIDFile + " not starting")
 	}

-	clientDir := buildconfig.WWCLIENTDIR()
-	testDir := path.Join(clientDir, "wwclient-test")
-
-	if os.Args[0] == path.Join(clientDir, "wwclient") {
+	if os.Args[0] == buildconfig.WWCLIENTLOC() {
 		err := os.Chdir("/")
 		if err != nil {
 			wwlog.Printf(wwlog.ERROR, "failed to change dir: %s", err)
@@ -77,15 +73,15 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		time.Sleep(5000 * time.Millisecond)
 	} else {
 		fmt.Printf("Called via: %s\n", os.Args[0])
-		fmt.Printf("Runtime overlay is being put in '%s' rather than '/'\n", testDir)
-		err := os.MkdirAll(testDir, 0755)
+		fmt.Printf("Runtime overlay is being put in '/warewulf/wwclient-test' rather than '/'\n")
+		err := os.MkdirAll("/warewulf/wwclient-test", 0755)
 		if err != nil {
 			wwlog.Printf(wwlog.ERROR, "failed to create dir: %s", err)
 			_ = os.Remove(PIDFile)
 			os.Exit(1)
 		}

-		err = os.Chdir(testDir)
+		err = os.Chdir("/warewulf/wwclient-test")
 		if err != nil {
 			wwlog.Printf(wwlog.ERROR, "failed to change dir: %s", err)
 			_ = os.Remove(PIDFile)
--- a/internal/app/wwctl/configure/dhcp/dhcp_main_test.go
+++ b/internal/app/wwctl/configure/dhcp/dhcp_main_test.go
@@ -1,4 +1,4 @@
-package configure
+package dhcp

 import (
 	"path"
@@ -8,12 +8,12 @@ import (
 )

 func TestDhcpTemplateFile(t *testing.T) {
-	tests := []struct {
+	tests := []struct{
 		parameter string
-		expected  string
+		expected string
 	}{
 		{"", path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/default-dhcpd.conf")},
-		{"default", path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/default-dhcpd.conf")},
+		{"default", path.Join(buildconfig.SYSCONFDIR(),  "warewulf/dhcp/default-dhcpd.conf")},
 		{"static", path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/static-dhcpd.conf")},
 		{"/test/absolute/path.conf", "/test/absolute/path.conf"},
 	}
@@ -25,3 +25,4 @@ func TestDhcpTemplateFile(t *testing.T) {
 		}
 	}
 }
+
--- a/internal/app/wwctl/configure/dhcp/main.go
+++ b/internal/app/wwctl/configure/dhcp/main.go
@@ -1,10 +1,144 @@
 package dhcp

 import (
-	"github.com/hpcng/warewulf/internal/pkg/configure"
+	"fmt"
+	"os"
+	"path"
+	"strconv"
+	"strings"
+	"text/template"
+
+	"github.com/hpcng/warewulf/internal/pkg/buildconfig"
+	"github.com/hpcng/warewulf/internal/pkg/node"
+	"github.com/hpcng/warewulf/internal/pkg/util"
+	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
+	"github.com/hpcng/warewulf/internal/pkg/wwlog"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

-func CobraRunE(cmd *cobra.Command, args []string) error {
-	return configure.Configure("DHCP", setShow)
+type dhcpTemplate struct {
+	Ipaddr     string
+	Port       string
+	RangeStart string
+	RangeEnd   string
+	Network    string
+	Netmask    string
+	Nodes      []node.NodeInfo
+}
+
+func CobraRunE(cmd *cobra.Command, args []string) error {
+	return Configure(SetShow)
+}
+
+func Configure(show bool) error {
+	var d dhcpTemplate
+	var templateFile string
+
+	nodeDB, err := node.New()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "Could not open node configuration: %s\n", err)
+		os.Exit(1)
+	}
+
+	controller, err := warewulfconf.New()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "%s\n", err)
+		os.Exit(1)
+	}
+
+	if controller.Ipaddr == "" {
+		wwlog.Printf(wwlog.ERROR, "The Warewulf IP Address is not properly configured\n")
+		os.Exit(1)
+	}
+
+	if controller.Netmask == "" {
+		wwlog.Printf(wwlog.ERROR, "The Warewulf Netmask is not properly configured\n")
+		os.Exit(1)
+	}
+
+	if !controller.Dhcp.Enabled {
+		wwlog.Printf(wwlog.INFO, "This system is not configured as a Warewulf DHCP controller\n")
+		os.Exit(1)
+	}
+
+	if controller.Dhcp.RangeStart == "" {
+		wwlog.Printf(wwlog.ERROR, "Configuration is not defined: `dhcpd range start`\n")
+		os.Exit(1)
+	}
+
+	if controller.Dhcp.RangeEnd == "" {
+		wwlog.Printf(wwlog.ERROR, "Configuration is not defined: `dhcpd range end`\n")
+		os.Exit(1)
+	}
+
+	if controller.Dhcp.ConfigFile == "" {
+		controller.Dhcp.ConfigFile = "/etc/dhcp/dhcpd.conf"
+	}
+
+	nodes, err := nodeDB.FindAllNodes()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "Could not find all controllers: %s\n", err)
+		os.Exit(1)
+	}
+
+	d.Nodes = append(d.Nodes, nodes...)
+
+	templateFile = dhcpTemplateFile(controller.Dhcp.Template)
+	tmpl, err := template.New(path.Base(templateFile)).ParseFiles(templateFile)
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "%s\n", err)
+		os.Exit(1)
+	}
+
+	d.Ipaddr = controller.Ipaddr
+	d.Port = strconv.Itoa(controller.Warewulf.Port)
+	d.Network = controller.Network
+	d.Netmask = controller.Netmask
+	d.RangeStart = controller.Dhcp.RangeStart
+	d.RangeEnd = controller.Dhcp.RangeEnd
+
+	if !show {
+		fmt.Printf("Writing the DHCP configuration file\n")
+		configWriter, err := os.OpenFile(controller.Dhcp.ConfigFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0640)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+		defer configWriter.Close()
+		err = tmpl.Execute(configWriter, d)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+
+		fmt.Printf("Enabling and restarting the DHCP services\n")
+		err = util.SystemdStart(controller.Dhcp.SystemdName)
+		if err != nil {
+			return errors.Wrap(err, "failed to start")
+		}
+	} else {
+		err = tmpl.Execute(os.Stdout, d)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+
+	}
+
+	return nil
+}
+
+// dhcpTemplateFile returns the path of the warewulf dhcp template given controller.Dhcp.Template.
+func dhcpTemplateFile(controllerDhcpTemplate string) (templateFile string) {
+	if controllerDhcpTemplate == "" {
+		templateFile = path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/default-dhcpd.conf")
+	} else {
+		if strings.HasPrefix(controllerDhcpTemplate, "/") {
+			templateFile = controllerDhcpTemplate
+		} else {
+			templateFile = path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/"+controllerDhcpTemplate+"-dhcpd.conf")
+		}
+	}
+	return
 }
--- a/internal/app/wwctl/configure/dhcp/root.go
+++ b/internal/app/wwctl/configure/dhcp/root.go
@@ -7,17 +7,17 @@ import (
 var (
 	baseCmd = &cobra.Command{
 		DisableFlagsInUseLine: true,
-		Use:                   "dhcp [OPTIONS]",
-		Short:                 "Manage and initialize DHCP",
+		Use:   "dhcp [OPTIONS]",
+		Short: "Manage and initialize DHCP",
 		Long: "DHCP is a dependent service to Warewulf. This command will configure DHCP as defined\n" +
 			"in the warewulf.conf file.",
 		RunE: CobraRunE,
 	}
-	setShow bool
+	SetShow bool
 )

 func init() {
-	baseCmd.PersistentFlags().BoolVarP(&setShow, "show", "s", false, "Show configuration (don't update)")
+	baseCmd.PersistentFlags().BoolVarP(&SetShow, "show", "s", false, "Show configuration (don't update)")
 }

 // GetRootCommand returns the root cobra.Command for the application.
--- a/internal/app/wwctl/configure/hosts/main.go
+++ b/internal/app/wwctl/configure/hosts/main.go
@@ -1,10 +1,117 @@
 package hosts

 import (
-	"github.com/hpcng/warewulf/internal/pkg/configure"
+	"bytes"
+	"os"
+	"path"
+	"text/template"
+
+	"github.com/hpcng/warewulf/internal/pkg/buildconfig"
+	"github.com/hpcng/warewulf/internal/pkg/node"
+	"github.com/hpcng/warewulf/internal/pkg/util"
+	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
+	"github.com/hpcng/warewulf/internal/pkg/wwlog"
 	"github.com/spf13/cobra"
 )

-func CobraRunE(cmd *cobra.Command, args []string) error {
-	return configure.Configure("hosts", setShow)
+type TemplateStruct struct {
+	PrevHostFile string
+	Ipaddr       string
+	Fqdn         string
+	AllNodes     []node.NodeInfo
+}
+
+func CobraRunE(cmd *cobra.Command, args []string) error {
+	return Configure(SetShow)
+}
+
+func Configure(show bool) error {
+	var replace TemplateStruct
+
+	if !util.IsFile(path.Join(buildconfig.SYSCONFDIR(), "warewulf/hosts.tmpl")) {
+		wwlog.Printf(wwlog.WARN, "Template not found, not updating host file\n")
+		return nil
+	}
+
+	controller, err := warewulfconf.New()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "%s\n", err)
+		os.Exit(1)
+	}
+
+	n, err := node.New()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "Could not open node configuration: %s\n", err)
+		os.Exit(1)
+	}
+
+	tmpl, err := template.ParseFiles(path.Join(buildconfig.SYSCONFDIR(), "warewulf/hosts.tmpl"))
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "Could not parse hosts template: %s\n", err)
+		os.Exit(1)
+	}
+
+	replace.PrevHostFile = ""
+	w, err := os.Open("/etc/hosts")
+	if err != nil {
+		wwlog.Printf(wwlog.WARN, "%s\n", err)
+	} else {
+		// if /etc/hosts.ww does not exist, backup /etc/hosts to /etc/hosts.wwbackup
+		if !util.IsFile("/etc/hosts.wwbackup") {
+			err = util.CopyFile("/etc/hosts", "/etc/hosts.wwbackup")
+			if err != nil {
+				wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			}
+		}
+
+		// read all lines before the # warewulf comment and put into PrevHostFile template variable
+		lines, _ := util.ReadFile("/etc/hosts")
+		if lines != nil {
+			var buffer bytes.Buffer
+			for _, line := range lines {
+				//wwlog.Printf(wwlog.INFO, "Reading line: %s\n", line)
+				if util.ValidString(line, "^#.*maintained by warewulf") {
+					break
+				}
+				buffer.WriteString(line)
+				buffer.WriteString("\n")
+			}
+			replace.PrevHostFile = buffer.String()
+		}
+	}
+
+	//wwlog.Printf(wwlog.INFO, "PrevHostFile is %s\n", replace.PrevHostFile)
+
+	w.Close()
+
+	nodes, _ := n.FindAllNodes()
+
+	replace.AllNodes = nodes
+	replace.Ipaddr = controller.Ipaddr
+	replace.Fqdn = controller.Fqdn
+
+	if !SetShow {
+		// only open "/etc/hosts" when intended to write, as 'os.O_TRUNC' will empty the file otherwise.
+		w, err = os.OpenFile("/etc/hosts", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+		defer w.Close()
+
+		err = tmpl.Execute(w, replace)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+	} else {
+		err = tmpl.Execute(os.Stdout, replace)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+
+	}
+
+	return nil
 }
--- a/internal/app/wwctl/configure/hosts/root.go
+++ b/internal/app/wwctl/configure/hosts/root.go
@@ -4,18 +4,18 @@ import "github.com/spf13/cobra"

 var (
 	baseCmd = &cobra.Command{
-		DisableFlagsInUseLine: true,
-		Use:                   "hosts [OPTIONS]",
-		Short:                 "Update the /etc/hosts file",
+                DisableFlagsInUseLine: true,
+		Use:   "hosts [OPTIONS]",
+		Short: "Update the /etc/hosts file",
 		Long: "Write out the /etc/hosts file based on the Warewulf template (hosts.tmpl) in the\n" +
 			"Warewulf configuration directory.",
 		RunE: CobraRunE,
 	}
-	setShow bool
+	SetShow bool
 )

 func init() {
-	baseCmd.PersistentFlags().BoolVarP(&setShow, "show", "s", false, "Show configuration (don't update)")
+	baseCmd.PersistentFlags().BoolVarP(&SetShow, "show", "s", false, "Show configuration (don't update)")
 }

 // GetRootCommand returns the root cobra.Command for the application.
--- a/internal/app/wwctl/configure/nfs/main.go
+++ b/internal/app/wwctl/configure/nfs/main.go
@@ -1,10 +1,75 @@
 package nfs

 import (
-	"github.com/hpcng/warewulf/internal/pkg/configure"
+	"fmt"
+	"os"
+
+	"github.com/hpcng/warewulf/internal/pkg/util"
+	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
+	"github.com/hpcng/warewulf/internal/pkg/wwlog"
+
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

 func CobraRunE(cmd *cobra.Command, args []string) error {
-	return configure.Configure("NFS", setShow)
+	return Configure(SetShow)
+}
+
+func Configure(show bool) error {
+
+	controller, err := warewulfconf.New()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "%s\n", err)
+		os.Exit(1)
+	}
+
+	if controller.Network == "" {
+		wwlog.Printf(wwlog.ERROR, "Network must be defined in warewulf.conf to configure NFS\n")
+		os.Exit(1)
+	}
+	if controller.Netmask == "" {
+		wwlog.Printf(wwlog.ERROR, "Netmask must be defined in warewulf.conf to configure NFS\n")
+		os.Exit(1)
+	}
+
+	if !SetShow {
+
+		if controller.Nfs.Enabled {
+			exports, err := os.OpenFile("/etc/exports", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
+			if err != nil {
+				wwlog.Printf(wwlog.ERROR, "%s\n", err)
+				os.Exit(1)
+			}
+			defer exports.Close()
+
+			fmt.Fprintf(exports, "# This file was written by Warewulf (wwctl configure nfs)\n")
+
+			for _, export := range controller.Nfs.ExportsExtended {
+				fmt.Fprintf(exports, "%s %s/%s(%s)\n", export.Path, controller.Network, controller.Netmask, export.ExportOptions)
+			}
+
+			fmt.Printf("Enabling and restarting the NFS services\n")
+			if controller.Nfs.SystemdName == "" {
+				err := util.SystemdStart("nfs-server")
+				if err != nil {
+					return errors.Wrap(err, "failed to start nfs-server")
+				}
+			} else {
+				err := util.SystemdStart(controller.Nfs.SystemdName)
+				if err != nil {
+					return errors.Wrap(err, "failed to start")
+				}
+			}
+		}
+	} else {
+		fmt.Printf("/etc/exports:\n")
+
+		for _, export := range controller.Nfs.ExportsExtended {
+			fmt.Printf("%s %s/%s\n", export.Path, controller.Network, controller.Netmask)
+		}
+		fmt.Printf("\n")
+	}
+
+	return nil
 }
--- a/internal/app/wwctl/configure/nfs/root.go
+++ b/internal/app/wwctl/configure/nfs/root.go
@@ -5,17 +5,17 @@ import "github.com/spf13/cobra"
 var (
 	baseCmd = &cobra.Command{
 		DisableFlagsInUseLine: true,
-		Use:                   "nfs [OPTIONS]",
-		Short:                 "Manage and initialize NFS",
+		Use:   "nfs [OPTIONS]",
+		Short: "Manage and initialize NFS",
 		Long: "NFS is an optional dependent service of Warewulf, this tool will automatically\n" +
 			"configure NFS as per the configuration in the warewulf.conf file.",
 		RunE: CobraRunE,
 	}
-	setShow bool
+	SetShow bool
 )

 func init() {
-	baseCmd.PersistentFlags().BoolVarP(&setShow, "show", "s", false, "Show configuration (don't update)")
+	baseCmd.PersistentFlags().BoolVarP(&SetShow, "show", "s", false, "Show configuration (don't update)")
 }

 // GetRootCommand returns the root cobra.Command for the application.
--- a/internal/app/wwctl/configure/root.go
+++ b/internal/app/wwctl/configure/root.go
@@ -1,6 +1,7 @@
 package configure

 import (
+	"fmt"
 	"os"

 	"github.com/hpcng/warewulf/internal/app/wwctl/configure/dhcp"
@@ -8,20 +9,20 @@ import (
 	"github.com/hpcng/warewulf/internal/app/wwctl/configure/nfs"
 	"github.com/hpcng/warewulf/internal/app/wwctl/configure/ssh"
 	"github.com/hpcng/warewulf/internal/app/wwctl/configure/tftp"
-	"github.com/hpcng/warewulf/internal/pkg/configure"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

 var (
 	baseCmd = &cobra.Command{
 		DisableFlagsInUseLine: true,
-		Use:                   "configure [OPTIONS]",
-		Short:                 "Manage system services",
+		Use:   "configure [OPTIONS]",
+		Short: "Manage system services",
 		Long: "This application allows you to manage and initialize Warewulf dependent system\n" +
 			"services based on the configuration in the warewulf.conf file.",
 		RunE: CobraRunE,
 	}
-	allFunctions bool
+	SetDoAll bool
 )

 func init() {
@@ -31,7 +32,7 @@ func init() {
 	baseCmd.AddCommand(ssh.GetCommand())
 	baseCmd.AddCommand(nfs.GetCommand())

-	baseCmd.PersistentFlags().BoolVarP(&allFunctions, "all", "a", false, "Configure all services")
+	baseCmd.PersistentFlags().BoolVarP(&SetDoAll, "all", "a", false, "Configure all services")
 }

 // GetRootCommand returns the root cobra.Command for the application.
@@ -40,17 +41,44 @@ func GetCommand() *cobra.Command {
 }

 func CobraRunE(cmd *cobra.Command, args []string) error {
-	var err error
-	if allFunctions {
-		for _, s := range [5]string{"DHPC", "hosts", "NFS", "SSH", "TFTP"} {
-			err = configure.Configure(s, false)
-			if err != nil {
-				os.Exit(1)
-			}
+	if SetDoAll {
+		fmt.Printf("################################################################################\n")
+		fmt.Printf("Configuring: DHCP\n")
+		err := dhcp.Configure(false)
+		if err != nil {
+			return errors.Wrap(err, "failed to configure dhcp")
+		}

+		fmt.Printf("################################################################################\n")
+		fmt.Printf("Configuring: TFTP\n")
+		err = tftp.Configure(false)
+		if err != nil {
+			return errors.Wrap(err, "failed to configure tftp")
+		}
+
+		fmt.Printf("################################################################################\n")
+		fmt.Printf("Configuring: /etc/hosts\n")
+		err = hosts.Configure(false)
+		if err != nil {
+			return errors.Wrap(err, "failed to configure hosts")
+		}
+
+		fmt.Printf("################################################################################\n")
+		fmt.Printf("Configuring: NFS\n")
+		err = nfs.Configure(false)
+		if err != nil {
+			return errors.Wrap(err, "failed to configure nfs")
+		}
+
+		fmt.Printf("################################################################################\n")
+		fmt.Printf("Configuring: SSH\n")
+		err = ssh.Configure(false)
+		if err != nil {
+			return errors.Wrap(err, "failed to configure ssh")
 		}
 	} else {
-		_ = cmd.Help()
+		//nolint:errcheck
+		cmd.Help()
 		os.Exit(0)
 	}

--- a/internal/app/wwctl/configure/ssh/main.go
+++ b/internal/app/wwctl/configure/ssh/main.go
@@ -1,10 +1,99 @@
 package ssh

 import (
-	"github.com/hpcng/warewulf/internal/pkg/configure"
+	"fmt"
+	"os"
+	"path"
+
+	"github.com/hpcng/warewulf/internal/pkg/buildconfig"
+	"github.com/hpcng/warewulf/internal/pkg/util"
+	"github.com/hpcng/warewulf/internal/pkg/wwlog"
+	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

 func CobraRunE(cmd *cobra.Command, args []string) error {
-	return configure.Configure("SSH", setShow)
+	return Configure(SetShow)
+}
+
+func Configure(show bool) error {
+	if os.Getuid() == 0 {
+		fmt.Printf("Updating system keys\n")
+
+		wwkeydir := path.Join(buildconfig.SYSCONFDIR(), "warewulf/keys") + "/"
+
+		err := os.MkdirAll(path.Join(buildconfig.SYSCONFDIR(), "warewulf/keys"), 0755)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "Could not create base directory: %s\n", err)
+			os.Exit(1)
+		}
+
+		if !util.IsFile(wwkeydir + "ssh_host_rsa_key") {
+			fmt.Printf("Setting up key: ssh_host_rsa_key\n")
+			err = util.ExecInteractive("ssh-keygen", "-q", "-t", "rsa", "-f", wwkeydir+"ssh_host_rsa_key", "-C", "", "-N", "")
+			if err != nil {
+				return errors.Wrap(err, "failed to exec ssh-keygen command")
+			}
+		} else {
+			fmt.Printf("Skipping, key already exists: ssh_host_rsa_key\n")
+		}
+
+		if !util.IsFile(wwkeydir + "ssh_host_dsa_key") {
+			fmt.Printf("Setting up key: ssh_host_dsa_key\n")
+			err = util.ExecInteractive("ssh-keygen", "-q", "-t", "dsa", "-f", wwkeydir+"ssh_host_dsa_key", "-C", "", "-N", "")
+			if err != nil {
+				return errors.Wrap(err, "failed to exec ssh-keygen command")
+			}
+		} else {
+			fmt.Printf("Skipping, key already exists: ssh_host_dsa_key\n")
+		}
+
+		if !util.IsFile(wwkeydir + "ssh_host_ecdsa_key") {
+			fmt.Printf("Setting up key: ssh_host_ecdsa_key\n")
+			err = util.ExecInteractive("ssh-keygen", "-q", "-t", "ecdsa", "-f", wwkeydir+"ssh_host_ecdsa_key", "-C", "", "-N", "")
+			if err != nil {
+				return errors.Wrap(err, "failed to exec ssh-keygen command")
+			}
+		} else {
+			fmt.Printf("Skipping, key already exists: ssh_host_ecdsa_key\n")
+		}
+
+		if !util.IsFile(wwkeydir + "ssh_host_ed25519_key") {
+			fmt.Printf("Setting up key: ssh_host_ed25519_key\n")
+			err = util.ExecInteractive("ssh-keygen", "-q", "-t", "ed25519", "-f", wwkeydir+"ssh_host_ed25519_key", "-C", "", "-N", "")
+			if err != nil {
+				return errors.Wrap(err, "failed to exec ssh-keygen command")
+			}
+		} else {
+			fmt.Printf("Skipping, key already exists: ssh_host_ed25519_key\n")
+		}
+	} else {
+		fmt.Printf("Updating user's keys\n")
+	}
+
+	homeDir, err := os.UserHomeDir()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "Could not obtain the user's home directory: %s\n", err)
+		os.Exit(1)
+	}
+
+	authorizedKeys := path.Join(homeDir, "/.ssh/authorized_keys")
+	rsaPriv := path.Join(homeDir, "/.ssh/id_rsa")
+	rsaPub := path.Join(homeDir, "/.ssh/id_rsa.pub")
+
+	if !util.IsFile(authorizedKeys) {
+		fmt.Printf("Setting up: %s\n", authorizedKeys)
+		err = util.ExecInteractive("ssh-keygen", "-q", "-t", "rsa", "-f", rsaPriv, "-C", "", "-N", "")
+		if err != nil {
+			return errors.Wrap(err, "failed to exec ssh-keygen command")
+		}
+		err := util.CopyFile(rsaPub, authorizedKeys)
+		if err != nil {
+			return errors.Wrap(err, "failed to copy keys")
+		}
+	} else {
+		fmt.Printf("Skipping, authorized_keys already exists: %s\n", authorizedKeys)
+	}
+
+	return nil
 }
--- a/internal/app/wwctl/configure/ssh/root.go
+++ b/internal/app/wwctl/configure/ssh/root.go
@@ -5,18 +5,18 @@ import "github.com/spf13/cobra"
 var (
 	baseCmd = &cobra.Command{
 		DisableFlagsInUseLine: true,
-		Use:                   "ssh [OPTIONS]",
-		Short:                 "Manage and initialize SSH",
+		Use:   "ssh [OPTIONS]",
+		Short: "Manage and initialize SSH",
 		Long: "SSH is an optionally dependent service for Warewulf, this tool will automatically\n" +
 			"setup the ssh keys nodes using the 'default' system overlay as well as user owned\n" +
 			"keys.",
 		RunE: CobraRunE,
 	}
-	setShow bool
+	SetShow bool
 )

 func init() {
-	baseCmd.PersistentFlags().BoolVarP(&setShow, "show", "s", false, "Show configuration (don't update)")
+	baseCmd.PersistentFlags().BoolVarP(&SetShow, "show", "s", false, "Show configuration (don't update)")
 }

 // GetRootCommand returns the root cobra.Command for the application.
--- a/internal/app/wwctl/configure/tftp/main.go
+++ b/internal/app/wwctl/configure/tftp/main.go
@@ -1,10 +1,70 @@
 package tftp

 import (
-	"github.com/hpcng/warewulf/internal/pkg/configure"
+	"fmt"
+	"os"
+	"path"
+
+	"github.com/hpcng/warewulf/internal/pkg/buildconfig"
+	"github.com/hpcng/warewulf/internal/pkg/staticfiles"
+	"github.com/hpcng/warewulf/internal/pkg/util"
+	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
+	"github.com/hpcng/warewulf/internal/pkg/wwlog"
 	"github.com/spf13/cobra"
 )

 func CobraRunE(cmd *cobra.Command, args []string) error {
-	return configure.Configure("TFTP", setShow)
+	return Configure(SetShow)
+}
+
+func Configure(show bool) error {
+	controller, err := warewulfconf.New()
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "%s\n", err)
+		os.Exit(1)
+	}
+
+	if buildconfig.TFTPDIR() == "" {
+		wwlog.Printf(wwlog.ERROR, "Tftp root directory is not configured by build\n")
+		os.Exit(1)
+	}
+
+	err = os.MkdirAll(path.Join(buildconfig.TFTPDIR(), "warewulf"), 0755)
+	if err != nil {
+		wwlog.Printf(wwlog.ERROR, "%s\n", err)
+		os.Exit(1)
+	}
+
+	if !show {
+		fmt.Printf("Writing PXE files to: %s\n", path.Join(buildconfig.TFTPDIR(), "warewulf"))
+		err = staticfiles.WriteData("files/tftp/x86.efi", path.Join(buildconfig.TFTPDIR(), "warewulf/x86.efi"))
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+		err = staticfiles.WriteData("files/tftp/i386.efi", path.Join(buildconfig.TFTPDIR(), "warewulf/i386.efi"))
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+		err = staticfiles.WriteData("files/tftp/i386.kpxe", path.Join(buildconfig.TFTPDIR(), "warewulf/i386.kpxe"))
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+		err = staticfiles.WriteData("files/tftp/arm64.efi", path.Join(buildconfig.TFTPDIR(), "warewulf/arm64.efi"))
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+
+		fmt.Printf("Enabling and restarting the TFTP services\n")
+		err = util.SystemdStart(controller.Tftp.SystemdName)
+		if err != nil {
+			wwlog.Printf(wwlog.ERROR, "%s\n", err)
+			os.Exit(1)
+		}
+	}
+
+	return nil
 }
--- a/internal/app/wwctl/configure/tftp/root.go
+++ b/internal/app/wwctl/configure/tftp/root.go
@@ -5,17 +5,17 @@ import "github.com/spf13/cobra"
 var (
 	baseCmd = &cobra.Command{
 		DisableFlagsInUseLine: true,
-		Use:                   "tftp [OPTIONS]",
-		Short:                 "Manage and initialize TFTP",
+		Use:   "tftp [OPTIONS]",
+		Short: "Manage and initialize TFTP",
 		Long: "TFTP is a dependent service of Warewulf, this tool will enable the tftp services\n" +
 			"on your Warewulf master.",
 		RunE: CobraRunE,
 	}
-	setShow bool
+	SetShow bool
 )

 func init() {
-	baseCmd.PersistentFlags().BoolVarP(&setShow, "show", "s", false, "Show configuration (don't update)")
+	baseCmd.PersistentFlags().BoolVarP(&SetShow, "show", "s", false, "Show configuration (don't update)")
 }

 // GetRootCommand returns the root cobra.Command for the application.
--- a/internal/pkg/buildconfig/defaults.go
+++ b/internal/pkg/buildconfig/defaults.go
@@ -6,7 +6,6 @@ var (
 	bindir         string = "UNDEF"
 	sysconfdir     string = "UNDEF"
 	localstatedir  string = "UNDEF"
-	sharedstatedir string = "UNDEF"
 	srvdir         string = "UNDEF"
 	tftpdir        string = "UNDEF"
 	firewallddir   string = "UNDEF"
@@ -14,9 +13,9 @@ var (
 	wwoverlaydir   string = "UNDEF"
 	wwchrootdir    string = "UNDEF"
 	wwprovisiondir string = "UNDEF"
-	wwclientdir    string = "UNDEF"
 	version        string = "UNDEF"
 	release        string = "UNDEF"
+	wwclientloc    string = "UNDEF"
 )

 func BINDIR() string {
@@ -79,12 +78,7 @@ func RELEASE() string {
 	return release
 }

-func WWCLIENTDIR() string {
-	wwlog.Printf(wwlog.DEBUG, "WWPROVISIONDIR = '%s'\n", wwclientdir)
-	return wwclientdir
-}
-
-func SHAREDSTATEDIR() string {
-	wwlog.Printf(wwlog.DEBUG, "SHAREDSTATEDIR = '%s'\n", sharedstatedir)
-	return sharedstatedir
+func WWCLIENTLOC() string {
+	wwlog.Printf(wwlog.DEBUG, "WWCLIENTLOC = '%s'\n", wwclientloc)
+	return wwclientloc
 }
--- a/internal/pkg/buildconfig/setconfigs.go.in
+++ b/internal/pkg/buildconfig/setconfigs.go.in
@@ -4,7 +4,6 @@ func init() {
    bindir = "@BINDIR@"
    sysconfdir = "@SYSCONFDIR@"
    localstatedir = "@LOCALSTATEDIR@"
-    sharedstatedir = "@SHAREDSTATEDIR@"
    srvdir = "@SRVDIR@"
    tftpdir = "@TFTPDIR@"
    firewallddir = "@FIREWALLDDIR@"
@@ -12,7 +11,7 @@ func init() {
    wwoverlaydir = "@WWOVERLAYDIR@"
    wwchrootdir = "@WWCHROOTDIR@"
    wwprovisiondir = "@WWPROVISIONDIR@"
-    wwclientdir = "@WWCLIENTDIR@"
    version = "@VERSION@"
    release = "@RELEASE@"
+    wwclientloc = "@WWCLIENTLOC"
 }
--- a/internal/pkg/configure/common.go
+++ b/internal/pkg/configure/common.go
@@ -1,32 +0,0 @@
-package configure
-
-import (
-	"fmt"
-
-	"github.com/pkg/errors"
-)
-
-func Configure(s string, v bool) error {
-	if !v {
-		fmt.Printf("################################################################################\n")
-		fmt.Printf("Configuring: %s\n", s)
-	}
-
-	var err error
-	switch s {
-	case "DHCP":
-		err = configureDHCP(v)
-	case "hosts":
-		err = configureHosts(v)
-	case "NFS":
-		err = configureNFS(v)
-	case "SSH":
-		err = configureSSH(v)
-	case "TFTP":
-		err = configureTFTP(v)
-	}
-	if err != nil {
-		return errors.Wrap(err, "Failed to configure "+s)
-	}
-	return nil
-}
--- a/internal/pkg/configure/dhcp.go
+++ b/internal/pkg/configure/dhcp.go
@@ -1,139 +0,0 @@
-package configure
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"text/template"
-
-	"github.com/hpcng/warewulf/internal/pkg/buildconfig"
-	"github.com/hpcng/warewulf/internal/pkg/node"
-	"github.com/hpcng/warewulf/internal/pkg/util"
-	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
-	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/pkg/errors"
-)
-
-type dhcpTemplate struct {
-	Ipaddr     string
-	Port       string
-	RangeStart string
-	RangeEnd   string
-	Network    string
-	Netmask    string
-	Nodes      []node.NodeInfo
-}
-
-func configureDHCP(show bool) error {
-	var d dhcpTemplate
-	var templateFile string
-
-	nodeDB, err := node.New()
-	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "Could not open node configuration: %s\n", err)
-		os.Exit(1)
-	}
-
-	controller, err := warewulfconf.New()
-	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "%s\n", err)
-		os.Exit(1)
-	}
-
-	if controller.Ipaddr == "" {
-		wwlog.Printf(wwlog.ERROR, "The Warewulf IP Address is not properly configured\n")
-		os.Exit(1)
-	}
-
-	if controller.Netmask == "" {
-		wwlog.Printf(wwlog.ERROR, "The Warewulf Netmask is not properly configured\n")
-		os.Exit(1)
-	}
-
-	if !controller.Dhcp.Enabled {
-		wwlog.Printf(wwlog.INFO, "This system is not configured as a Warewulf DHCP controller\n")
-		os.Exit(1)
-	}
-
-	if controller.Dhcp.RangeStart == "" {
-		wwlog.Printf(wwlog.ERROR, "Configuration is not defined: `dhcpd range start`\n")
-		os.Exit(1)
-	}
-
-	if controller.Dhcp.RangeEnd == "" {
-		wwlog.Printf(wwlog.ERROR, "Configuration is not defined: `dhcpd range end`\n")
-		os.Exit(1)
-	}
-
-	if controller.Dhcp.ConfigFile == "" {
-		controller.Dhcp.ConfigFile = "/etc/dhcp/dhcpd.conf"
-	}
-
-	nodes, err := nodeDB.FindAllNodes()
-	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "Could not find all controllers: %s\n", err)
-		os.Exit(1)
-	}
-
-	d.Nodes = append(d.Nodes, nodes...)
-
-	templateFile = dhcpTemplateFile(controller.Dhcp.Template)
-	tmpl, err := template.New(path.Base(templateFile)).ParseFiles(templateFile)
-	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "%s\n", err)
-		os.Exit(1)
-	}
-
-	d.Ipaddr = controller.Ipaddr
-	d.Port = strconv.Itoa(controller.Warewulf.Port)
-	d.Network = controller.Network
-	d.Netmask = controller.Netmask
-	d.RangeStart = controller.Dhcp.RangeStart
-	d.RangeEnd = controller.Dhcp.RangeEnd
-
-	if !show {
-		fmt.Printf("Writing the DHCP configuration file\n")
-		configWriter, err := os.OpenFile(controller.Dhcp.ConfigFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0640)
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			os.Exit(1)
-		}
-		defer configWriter.Close()
-		err = tmpl.Execute(configWriter, d)
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			os.Exit(1)
-		}
-
-		fmt.Printf("Enabling and restarting the DHCP services\n")
-		err = util.SystemdStart(controller.Dhcp.SystemdName)
-		if err != nil {
-			return errors.Wrap(err, "failed to start")
-		}
-	} else {
-		err = tmpl.Execute(os.Stdout, d)
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			os.Exit(1)
-		}
-
-	}
-
-	return nil
-}
-
-// dhcpTemplateFile returns the path of the warewulf dhcp template given controller.Dhcp.Template.
-func dhcpTemplateFile(controllerDhcpTemplate string) (templateFile string) {
-	if controllerDhcpTemplate == "" {
-		templateFile = path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/default-dhcpd.conf")
-	} else {
-		if strings.HasPrefix(controllerDhcpTemplate, "/") {
-			templateFile = controllerDhcpTemplate
-		} else {
-			templateFile = path.Join(buildconfig.SYSCONFDIR(), "warewulf/dhcp/"+controllerDhcpTemplate+"-dhcpd.conf")
-		}
-	}
-	return
-}
--- a/internal/pkg/configure/hosts.go
+++ b/internal/pkg/configure/hosts.go
@@ -1,110 +0,0 @@
-package configure
-
-import (
-	"bytes"
-	"os"
-	"path"
-	"text/template"
-
-	"github.com/hpcng/warewulf/internal/pkg/buildconfig"
-	"github.com/hpcng/warewulf/internal/pkg/node"
-	"github.com/hpcng/warewulf/internal/pkg/util"
-	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
-	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-)
-
-type hostsTemplate struct {
-	PrevHostFile string
-	Ipaddr       string
-	Fqdn         string
-	AllNodes     []node.NodeInfo
-}
-
-func configureHosts(show bool) error {
-	var replace hostsTemplate
-
-	if !util.IsFile(path.Join(buildconfig.SYSCONFDIR(), "warewulf/hosts.tmpl")) {
-		wwlog.Printf(wwlog.WARN, "Template not found, not updating host file\n")
-		return nil
-	}
-
-	controller, err := warewulfconf.New()
-	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "%s\n", err)
-		os.Exit(1)
-	}
-
-	n, err := node.New()
-	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "Could not open node configuration: %s\n", err)
-		os.Exit(1)
-	}
-
-	tmpl, err := template.ParseFiles(path.Join(buildconfig.SYSCONFDIR(), "warewulf/hosts.tmpl"))
-	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "Could not parse hosts template: %s\n", err)
-		os.Exit(1)
-	}
-
-	replace.PrevHostFile = ""
-	w, err := os.Open("/etc/hosts")
-	if err != nil {
-		wwlog.Printf(wwlog.WARN, "%s\n", err)
-	} else {
-		// if /etc/hosts.ww does not exist, backup /etc/hosts to /etc/hosts.wwbackup
-		if !util.IsFile("/etc/hosts.wwbackup") {
-			err = util.CopyFile("/etc/hosts", "/etc/hosts.wwbackup")
-			if err != nil {
-				wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			}
-		}
-
-		// read all lines before the # warewulf comment and put into PrevHostFile template variable
-		lines, _ := util.ReadFile("/etc/hosts")
-		if lines != nil {
-			var buffer bytes.Buffer
-			for _, line := range lines {
-				//wwlog.Printf(wwlog.INFO, "Reading line: %s\n", line)
-				if util.ValidString(line, "^#.*maintained by warewulf") {
-					break
-				}
-				buffer.WriteString(line)
-				buffer.WriteString("\n")
-			}
-			replace.PrevHostFile = buffer.String()
-		}
-	}
-
-	w.Close()
-
-	nodes, _ := n.FindAllNodes()
-
-	replace.AllNodes = nodes
-	replace.Ipaddr = controller.Ipaddr
-	replace.Fqdn = controller.Fqdn
-
-	if !show {
-		// only open "/etc/hosts" when intended to write, as 'os.O_TRUNC' will empty the file otherwise.
-		w, err = os.OpenFile("/etc/hosts", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			os.Exit(1)
-		}
-		defer w.Close()
-
-		err = tmpl.Execute(w, replace)
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			os.Exit(1)
-		}
-	} else {
-		err = tmpl.Execute(os.Stdout, replace)
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			os.Exit(1)
-		}
-
-	}
-
-	return nil
-}
--- a/internal/pkg/configure/nfs.go
+++ b/internal/pkg/configure/nfs.go
@@ -1,69 +0,0 @@
-package configure
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/hpcng/warewulf/internal/pkg/util"
-	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
-	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/pkg/errors"
-)
-
-func configureNFS(show bool) error {
-
-	controller, err := warewulfconf.New()
-	if err != nil {
-		wwlog.Printf(wwlog.ERROR, "%s\n", err)
-		os.Exit(1)
-	}
-
-	if controller.Network == "" {
-		wwlog.Printf(wwlog.ERROR, "Network must be defined in warewulf.conf to configure NFS\n")
-		os.Exit(1)
-	}
-	if controller.Netmask == "" {
-		wwlog.Printf(wwlog.ERROR, "Netmask must be defined in warewulf.conf to configure NFS\n")
-		os.Exit(1)
-	}
-
-	if !show {
-
-		if controller.Nfs.Enabled {
-			exports, err := os.OpenFile("/etc/exports", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
-			if err != nil {
-				wwlog.Printf(wwlog.ERROR, "%s\n", err)
-				os.Exit(1)
-			}
-			defer exports.Close()
-
-			fmt.Fprintf(exports, "# This file was written by Warewulf (wwctl configure nfs)\n")
-
-			for _, export := range controller.Nfs.ExportsExtended {
-				fmt.Fprintf(exports, "%s %s/%s(%s)\n", export.Path, controller.Network, controller.Netmask, export.ExportOptions)
-			}
-
-			fmt.Printf("Enabling and restarting the NFS services\n")
-			if controller.Nfs.SystemdName == "" {
-				err := util.SystemdStart("nfs-server")
-				if err != nil {
-					return errors.Wrap(err, "failed to start nfs-server")
-				}
-			} else {
-				err := util.SystemdStart(controller.Nfs.SystemdName)
-				if err != nil {
-					return errors.Wrap(err, "failed to start")
-				}
-			}
-		}
-	} else {
-		fmt.Printf("/etc/exports:\n")
-
-		for _, export := range controller.Nfs.ExportsExtended {
-			fmt.Printf("%s %s/%s\n", export.Path, controller.Network, controller.Netmask)
-		}
-		fmt.Printf("\n")
-	}
-
-	return nil
-}
--- a/internal/pkg/configure/ssh.go
+++ b/internal/pkg/configure/ssh.go
@@ -1,72 +0,0 @@
-package configure
-
-import (
-	"fmt"
-	"os"
-	"path"
-
-	"github.com/hpcng/warewulf/internal/pkg/buildconfig"
-	"github.com/hpcng/warewulf/internal/pkg/util"
-	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-	"github.com/pkg/errors"
-)
-
-func configureSSH(show bool) error {
-	if !show {
-		if os.Getuid() == 0 {
-			fmt.Printf("Updating system keys\n")
-
-			wwkeydir := path.Join(buildconfig.SYSCONFDIR(), "warewulf/keys") + "/"
-
-			err := os.MkdirAll(path.Join(buildconfig.SYSCONFDIR(), "warewulf/keys"), 0755)
-			if err != nil {
-				wwlog.Printf(wwlog.ERROR, "Could not create base directory: %s\n", err)
-				os.Exit(1)
-			}
-
-			for _, k := range [4]string{"rsa", "dsa", "ecdsa", "ed25519"} {
-				keytype := "ssh_host_" + k + "_key"
-				if !util.IsFile(path.Join(wwkeydir, keytype)) {
-					fmt.Printf("Setting up key: %s\n", keytype)
-					wwlog.Printf(wwlog.DEBUG, "Creating new %s key\n", keytype)
-					err = util.ExecInteractive("ssh-keygen", "-q", "-t", k, "-f", path.Join(wwkeydir, keytype), "-C", "", "-N", "")
-					if err != nil {
-						wwlog.Printf(wwlog.ERROR, "Failed to exec ssh-keygen: %s\n", err)
-						return errors.Wrap(err, "failed to exec ssh-keygen command")
-					}
-				} else {
-					fmt.Printf("Skipping, key already exists: %s\n", keytype)
-				}
-			}
-		} else {
-			fmt.Printf("Updating user's keys\n")
-		}
-
-		homeDir, err := os.UserHomeDir()
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "Could not obtain the user's home directory: %s\n", err)
-			os.Exit(1)
-		}
-
-		authorizedKeys := path.Join(homeDir, "/.ssh/authorized_keys")
-		rsaPriv := path.Join(homeDir, "/.ssh/id_rsa")
-		rsaPub := path.Join(homeDir, "/.ssh/id_rsa.pub")
-
-		if !util.IsFile(authorizedKeys) {
-			fmt.Printf("Setting up: %s\n", authorizedKeys)
-			err = util.ExecInteractive("ssh-keygen", "-q", "-t", "rsa", "-f", rsaPriv, "-C", "", "-N", "")
-			if err != nil {
-				return errors.Wrap(err, "failed to exec ssh-keygen command")
-			}
-			err := util.CopyFile(rsaPub, authorizedKeys)
-			if err != nil {
-				return errors.Wrap(err, "failed to copy keys")
-			}
-		} else {
-			fmt.Printf("Skipping, authorized_keys already exists: %s\n", authorizedKeys)
-		}
-	} else {
-		fmt.Printf("'ssh -s' is not yet implemented.\n")
-	}
-	return nil
-}
--- a/internal/pkg/configure/tftp.go
+++ b/internal/pkg/configure/tftp.go
@@ -1,51 +0,0 @@
-package configure
-
-import (
-	"fmt"
-	"os"
-	"path"
-
-	"github.com/hpcng/warewulf/internal/pkg/buildconfig"
-	"github.com/hpcng/warewulf/internal/pkg/staticfiles"
-	"github.com/hpcng/warewulf/internal/pkg/util"
-	"github.com/hpcng/warewulf/internal/pkg/warewulfconf"
-	"github.com/hpcng/warewulf/internal/pkg/wwlog"
-)
-
-var tftpdir string = path.Join(buildconfig.TFTPDIR(), "warewulf")
-
-func configureTFTP(show bool) error {
-	if !show {
-		controller, err := warewulfconf.New()
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			return err
-		}
-
-		err = os.MkdirAll(tftpdir, 0755)
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			return err
-		}
-
-		fmt.Printf("Writing PXE files to: %s\n", tftpdir)
-		for _, f := range [4]string{"x86.efi", "i386.efi", "i386.kpxe", "arm64.efi"} {
-			err = staticfiles.WriteData(path.Join("files/tftp", f), path.Join(tftpdir, f))
-			if err != nil {
-				wwlog.Printf(wwlog.ERROR, "%s\n", err)
-				return err
-			}
-		}
-
-		fmt.Printf("Enabling and restarting the TFTP services\n")
-		err = util.SystemdStart(controller.Tftp.SystemdName)
-		if err != nil {
-			wwlog.Printf(wwlog.ERROR, "%s\n", err)
-			return err
-		}
-	} else {
-		fmt.Printf("'tftp -s' is not yet implemented.\n")
-	}
-
-	return nil
-}
--- a/overlays/wwinit/etc/systemd/system/wwclient.service.in
+++ b/overlays/wwinit/etc/systemd/system/wwclient.service.in
@@ -5,7 +5,7 @@ After=local-fs.target

 [Service]
 Type=notify
-ExecStart=@WWCLIENTDIR@/wwclient
+ExecStart=/warewulf/bin/wwclient
 ExecReload=/bin/kill -s SIGHUP "$MAINPID"
 PIDFile=/var/run/wwclient.pid
 TimeoutSec=60
--- a/overlays/wwinit/init.in
+++ b/overlays/wwinit/init.in
@@ -6,8 +6,8 @@
 # Edit at your own risk! DANGER DANGER.


-if test -f "@WWCLIENTDIR@/config"; then
-    . @WWCLIENTDIR@/config
+if test -f "/warewulf/config"; then
+    . /warewulf/config
 else
    echo "ERROR: Warewulf configuration file not found... rebooting in 1 minute"
    sleep 60
@@ -24,7 +24,7 @@ mount -t devtmpfs devtmpfs /dev
 mount -t sysfs sysfs /sys
 mount -t tmpfs tmpfs /run

-chmod 755 @WWCLIENTDIR@/wwinit
+chmod 755 /warewulf/wwinit

 echo "Checking Rootfs type"
 ROOTFSTYPE=`stat -f -c "%T" /`
@@ -32,7 +32,7 @@ ROOTFSTYPE=`stat -f -c "%T" /`
 if test "$WWROOT" = "initramfs"; then
    echo "Provisioned to default initramfs file system: $ROOTFSTYPE"
    echo "Calling WW Init"
-    exec @WWCLIENTDIR@/wwinit
+    exec /warewulf/wwinit
 elif test "$WWROOT" = "tmpfs"; then
    if test "$ROOTFSTYPE" = "tmpfs"; then
        echo "ERROR: Switching the root file system requires the kernel argument: 'rootfstype=ramfs'"
@@ -44,7 +44,7 @@ elif test "$WWROOT" = "tmpfs"; then
        tar -cf - --exclude ./proc --exclude ./sys --exclude ./dev --exclude ./newroot . | tar -xf - -C /newroot
        mkdir /newroot/proc /newroot/dev /newroot/sys /newroot/run 2>/dev/null
        echo "Calling switch_root and invoking WW Init"
-        exec /sbin/switch_root /newroot @WWCLIENTDIR@/wwinit
+        exec /sbin/switch_root /newroot /warewulf/wwinit
    fi
 else
    echo "ERROR: Unknown Warewulf Root file system: $WWROOT"
--- a/overlays/wwinit/warewulf/config.ww
+++ b/overlays/wwinit/warewulf/config.ww
--- a/overlays/wwinit/warewulf/init.d/20-loopback
+++ b/overlays/wwinit/warewulf/init.d/20-loopback
@@ -1,6 +1,6 @@
 #!/bin/sh

-. @WWCLIENTDIR@/config
+. /warewulf/config

 echo "Bringing up lo:127.0.0.1"
 /sbin/ip link set dev lo up
--- a/overlays/wwinit/warewulf/init.d/50-ipmi
+++ b/overlays/wwinit/warewulf/init.d/50-ipmi
@@ -1,6 +1,6 @@
 #!/bin/bash

-. @WWCLIENTDIR@/config
+. /warewulf/config

 export PATH=/usr/bin:/bin:/usr/sbin:/sbin

--- a/overlays/wwinit/warewulf/init.d/75-vnfs_fixes
+++ b/overlays/wwinit/warewulf/init.d/75-vnfs_fixes
@@ -1,6 +1,6 @@
 #!/bin/sh

-. @WWCLIENTDIR@/config
+. /warewulf/config

 # This will eventually be optional
 if true; then
--- a/overlays/wwinit/warewulf/init.d/80-wwclient
+++ b/overlays/wwinit/warewulf/init.d/80-wwclient
@@ -1,7 +1,7 @@
 #!/bin/sh

-. @WWCLIENTDIR@/config
+. /warewulf/config
 # Only start if the systemd is no available
 test -e /usr/lib/systemd/systemd && exit 0
 echo "Starting wwclient"
-nohup @WWCLIENTDIR@/wwclient >/var/log/wwclient.log 2>&1 </dev/null &
+nohup /warewulf/bin/wwclient >/var/log/wwclient.log 2>&1 </dev/null &
--- a/overlays/wwinit/warewulf/init.d/90-selinux
+++ b/overlays/wwinit/warewulf/init.d/90-selinux
@@ -1,6 +1,6 @@
 #!/bin/bash

-. @WWCLIENTDIR@/config
+. /warewulf/config

 if test -z "$WWROOT"; then
    echo "Skipping SELinux configuration: Warewulf Root device not set"
--- a/overlays/wwinit/warewulf/wwinit
+++ b/overlays/wwinit/warewulf/wwinit
@@ -2,9 +2,9 @@

 echo "Hello from WWINIT"

-. @WWCLIENTDIR@/config
+. /warewulf/config

-for i in @WWCLIENTDIR@/init.d/*; do
+for i in /warewulf/init.d/*; do
    NAME=`basename $i`
    echo "Launching: $NAME"
    sh "$i"
--- a/warewulf.spec.in
+++ b/warewulf.spec.in
@@ -1,15 +1,12 @@
-%define debug_package %{nil}
-
-%if 0%{?sle_version}
-%global tftpdir /srv/tftpboot
-%global srvdir /srv
-%else
-# Assume Fedora-based OS if not SUSE-based
-%global tftpdir /var/lib/tftpboot
-%global srvdir %{_sharedstatedir}
-%endif
-
 %global wwgroup warewulf
+%if 0%{?sle_version}
+%global tftpdir "/srv/tftpboot"
+%global srvdir "/srv"
+%else
+%global tftpdir "/var/lib/tftpboot"
+%global srvdir "%{_localstatedir}/warewulf/srv"
+%endif
+%define debug_package %{nil}

 Name: warewulf
 Summary: A provisioning system for large clusters of bare metal and/or virtual systems
@@ -30,18 +27,17 @@ Conflicts: warewulf-ipmi

 BuildRequires: make

-%if 0%{?sle_version}
-BuildRequires: systemd-rpm-macros
-BuildRequires: go
-BuildRequires: firewall-macros
-Requires: tftp
-Requires: nfs-kernel-server
-%else
+%if 0%{?rhel}
 BuildRequires: systemd
 BuildRequires: golang
-BuildRequires: firewalld-filesystem
 Requires: tftp-server
 Requires: nfs-utils
+%else
+# sle_version
+BuildRequires: systemd-rpm-macros
+BuildRequires: go
+Requires: tftp
+Requires: nfs-kernel-server
 %endif

 %if 0%{?rhel} >= 8 || 0%{?sle_version}
@@ -61,36 +57,30 @@ system for large clusters of bare metal and/or virtual systems.


 %build
-make genconfig \
-    PREFIX=%{_prefix} \
-    BINDIR=%{_bindir} \
+make genconfig PREFIX=/usr \
+    SRVDIR=%{srvdir} \
+    LOCALSTATEDIR=%{_localstatedir} \
    SYSCONFDIR=%{_sysconfdir} \
    DATADIR=%{_datadir} \
-    LOCALSTATEDIR=%{_localstatedir} \
-    SHAREDSTATEDIR=%{_sharedstatedir} \
    MANDIR=%{_mandir} \
-    INFODIR=%{_infodir} \
-    DOCDIR=%{_docdir} \
-    SRVDIR=%{srvdir} \
+    BINDIR=%{_bindir} \
    TFTPDIR=%{tftpdir} \
    SYSTEMDDIR=%{_unitdir} \
-    BASHCOMPDIR=/etc/bash_completion.d/ \
-    FIREWALLDDIR=/usr/lib/firewalld/services \
-    WWCLIENTDIR=%{_libexecdir}/warewulf
-make
+    MANDIR=%{_mandir} \
+    BASH_COMPLETION=/etc/bash_completion.d/ \
+    FIREWALLDDIR=/usr/lib/firewalld/services

+make

 %install
 make install DESTDIR=%{buildroot}

-
 %pre
 getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup}


 %post
 %systemd_post warewulfd.service
-%firewalld_reload


 %preun
@@ -99,34 +89,26 @@ getent group %{wwgroup} >/dev/null || groupadd -r %{wwgroup}

 %postun
 %systemd_postun_with_restart warewulfd.service
-%firewalld_reload


 %files
 %defattr(-, root, %{wwgroup})
-%dir %{_sysconfdir}/warewulf
-%config(noreplace) %{_sysconfdir}/warewulf/*
-%config(noreplace) %attr(0640,-,-) %{_sysconfdir}/warewulf/nodes.conf
+%dir %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/*
+%config(noreplace) %attr(0640,-,-) %{_sysconfdir}/%{name}/nodes.conf
 %{_sysconfdir}/bash_completion.d/warewulf

-%dir %{_sharedstatedir}/warewulf
-%{_sharedstatedir}/warewulf/chroots
-%{_sharedstatedir}/warewulf/overlays
-%{srvdir}/warewulf
+%dir %{_localstatedir}/warewulf
+%{_localstatedir}/warewulf/chroots
+%{_localstatedir}/warewulf/overlays
+%{srvdir}

 %attr(-, root, root) %{_bindir}/wwctl
 %attr(-, root, root) %{_prefix}/lib/firewalld/services/warewulf.xml
 %attr(-, root, root) %{_unitdir}/warewulfd.service
 %attr(-, root, root) %{_mandir}/man1/wwctl*

-%license %{_docdir}/warewulf/LICENSE.md
-
-
 %changelog
-* Wed Jan 26 2022 Jeremy Siadal <jeremy.c.siadal@intel.com> - 4.2.0-1
- Add license install
- Updates for RH and SUSE RPM guidelines
-
 * Sat Jan 15 2022 Gregory Kurtzer <gmkurtzer@gmail.com> - 4.2.0-1
 - Integrated genconfig Make options
 - Cleaned up SPEC to use default RPM macros