From 3ad4b428965101884b20f12d58f4dca17debb9c7 Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.co>
Date: Wed, 14 Dec 2022 00:23:50 -0700
Subject: [PATCH] Treat wwapi config files as built versions

The wwapi*.conf files are build from .in variants, so they should not be
tracked in the tree. Adding them to gitignore prevents them from being
added back in, and adding them to Makefile:clean cleans them up.

Signed-off-by: Jonathon Anderson <janderson@ciq.co>
---
 .gitignore       |  3 +++
 Makefile         |  1 +
 etc/wwapic.conf  |  9 ---------
 etc/wwapid.conf  | 10 ----------
 etc/wwapird.conf | 20 --------------------
 5 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 etc/wwapic.conf
 delete mode 100644 etc/wwapid.conf
 delete mode 100644 etc/wwapird.conf

diff --git a/.gitignore b/.gitignore
index fa4124cb..96fe0936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,5 +33,8 @@ Defaults.mk
 /etc/wwapid.config
 /etc/wwapic.config
 /etc/wwapird.config
+/etc/wwapid.conf
+/etc/wwapic.conf
+/etc/wwapird.conf
 .dist/
 userdocs/_*
diff --git a/Makefile b/Makefile
index 23e8ad2f..7efd3119 100644
--- a/Makefile
+++ b/Makefile
@@ -306,6 +306,7 @@ clean:
 	rm -f config_defaults
 	rm -f update_configuration
 	rm -f print_defaults
+	rm -f etc/wwapi{c,d,rd}.conf
 
 install: files install_wwclient
 
diff --git a/etc/wwapic.conf b/etc/wwapic.conf
deleted file mode 100644
index e16cc959..00000000
--- a/etc/wwapic.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# Configuration for wwapic, the grpc wwapi client.
-api:
-  server: localhost
-  port: 9872
-tls:
-  enabled: true
-  cert: /usr/local/etc/warewulf/keys/wwapic/client.pem
-  key: /usr/local/etc/warewulf/keys/wwapic/client.key
-  cacert: /usr/local/etc/warewulf/keys/wwapic/cacert.pem
\ No newline at end of file
diff --git a/etc/wwapid.conf b/etc/wwapid.conf
deleted file mode 100644
index b5ad8389..00000000
--- a/etc/wwapid.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Configuration for wwapird, the wwapi grpc server.
-api:
-  version: 1.0.0
-  prefix: v1
-  port: 9872
-tls:
-  enabled: true
-  cert: /usr/local/etc/warewulf/keys/wwapid/server.pem
-  key: /usr/local/etc/warewulf/keys/wwapid/server.key
-  cacert: /usr/local/etc/warewulf/keys/wwapid/cacert.pem
\ No newline at end of file
diff --git a/etc/wwapird.conf b/etc/wwapird.conf
deleted file mode 100644
index d9714794..00000000
--- a/etc/wwapird.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# Configuration for wwapird, the grpc / http reverse proxy REST server.
-# This server allows one to curl the wwapi.
-clientapi:
-  server: localhost
-  port: 9872
-serverapi:
-  version: ignored
-  prefix: ignored
-  port: 9871
-clienttls:
-  enabled: true
-  cert: /usr/local/etc/warewulf/keys/wwapird/client.pem
-  key: /usr/local/etc/warewulf/keys/wwapird/client.key
-  cacert: /usr/local/etc/warewulf/keys/wwapird/cacert.pem
-servertls:
-  enabled: true
-  cert: ignored
-  key: /usr/local/etc/warewulf/keys/server.key
-  cacert: ignored
-  concatcert: /usr/local/etc/warewulf/keys/serverAndCacert.pem # This is a cat of server.pem and cacert.pem