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>
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -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/_*
|
||||
|
||||
1
Makefile
1
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
|
||||
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user