From adb54a870d098e000be97fe1e9279fb2054c1e9e Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.com>
Date: Thu, 17 Oct 2024 22:53:56 -0400
Subject: [PATCH] Remove vestigial default.conf components

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
---
 Makefile                      |  7 +----
 docs/man/man5/defaults.conf.5 | 54 -----------------------------------
 2 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 docs/man/man5/defaults.conf.5

diff --git a/Makefile b/Makefile
index 866dd499..4c3cc10c 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ include Variables.mk
 include Tools.mk
 
 .PHONY: build
-build: wwctl wwclient etc/defaults.conf etc/bash_completion.d/wwctl
+build: wwctl wwclient etc/bash_completion.d/wwctl
 
 .PHONY: api
 api: wwapid wwapic wwapird
@@ -65,9 +65,6 @@ man_pages: wwctl $(wildcard docs/man/man5/*.5)
 	gzip --force docs/man/man1/*.1
 	for manpage in docs/man/man5/*.5; do gzip <$${manpage} >$${manpage}.gz; done
 
-etc/defaults.conf: wwctl
-	./wwctl --emptyconf genconfig defaults >etc/defaults.conf
-
 etc/bash_completion.d/wwctl: wwctl
 	mkdir -p etc/bash_completion.d/
 	./wwctl --emptyconf genconfig completions >etc/bash_completion.d/wwctl
@@ -117,7 +114,6 @@ install: build docs
 	# wwctl genconfig to get the compiled in paths to warewulf.conf
 	test -f $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf || ./wwctl --warewulfconf etc/warewulf.conf genconfig warewulfconf print> $(DESTDIR)$(WWCONFIGDIR)/warewulf.conf
 	test -f $(DESTDIR)$(WWCONFIGDIR)/nodes.conf || install -m 0644 etc/nodes.conf $(DESTDIR)$(WWCONFIGDIR)
-	test -f $(DESTDIR)$(DATADIR)/warewulf/defaults.conf || install -m 0644 etc/defaults.conf $(DESTDIR)$(DATADIR)/warewulf/defaults.conf
 	for f in etc/examples/*.ww; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/examples/; done
 	for f in etc/ipxe/*.ipxe; do install -m 0644 $$f $(DESTDIR)$(WWCONFIGDIR)/ipxe/; done
 	install -m 0644 etc/grub/grub.cfg.ww $(DESTDIR)$(WWCONFIGDIR)/grub/grub.cfg.ww
@@ -180,7 +176,6 @@ latexpdf: reference
 cleanconfig:
 	rm -f $(config)
 	rm -rf etc/bash_completion.d/
-	rm -rf etc/defaults.conf
 
 .PHONY: cleantest
 cleantest:
diff --git a/docs/man/man5/defaults.conf.5 b/docs/man/man5/defaults.conf.5
deleted file mode 100644
index 86096585..00000000
--- a/docs/man/man5/defaults.conf.5
+++ /dev/null
@@ -1,54 +0,0 @@
-.TH "NODES.CONF" "5"
-
-.SH NAME
-
-defaults.conf \- default configuration for Warewulf nodes
-
-.SH DESCRIPTION
-.LP
-
-\fBdefaults.conf\fP defaults default values for node attributes when
-the attributes are not defined via a node's definition or in any of
-its profiles. It is a flat text YAML configuration file with a single
-\fBdefaultnode\fP node. After the definition of this node follows the
-structure of a node within \fBnodes.pp\fP.
-
-.SH EXAMPLE
-
-.EX
-defaultnode:
-  runtime overlay:
-  - hosts
-  - ssh.authorized_keys
-  - syncuser
-  system overlay:
-  - wwinit
-  - wwclient
-  - fstab
-  - hostname
-  - ssh.host_keys
-  - issue
-  - resolv
-  - udev.netname
-  - systemd.netname
-  - ifcfg
-  - NetworkManager
-  - debian.interfaces
-  - wicked
-  - ignition
-  kernel:
-    args: quiet crashkernel=no vga=791 net.naming-scheme=v238
-  init: /sbin/init
-  root: initramfs
-  ipxe template: default
-  profiles:
-  - default
-  network devices:
-    dummy:
-      type: ethernet
-      netmask: 255.255.255.0
-.EE
-
-.SH SEE ALSO
-
-\fBwwctl(1)\fP, \fBwwctl-nodes(1)\fP, \fBwwctl-profile(1)\fP