Properly support relative paths to the SYSCONFDIR

2022-01-26 03:46:39 +00:00
parent af32998c2b
commit 2d880aae76
10 changed files with 16 additions and 12 deletions
--- a/overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww
+++ b/overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_dsa_key.pub"}}
+{{Include "keys/ssh_host_dsa_key.pub"}}
--- a/overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww
+++ b/overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_dsa_key"}}
+{{Include "keys/ssh_host_dsa_key"}}
--- a/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww
+++ b/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_ecdsa_key.pub"}}
+{{Include "keys/ssh_host_ecdsa_key.pub"}}
--- a/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww
+++ b/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_ecdsa_key"}}
+{{Include "keys/ssh_host_ecdsa_key"}}
--- a/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww
+++ b/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_ed25519_key.pub"}}
+{{Include "keys/ssh_host_ed25519_key.pub"}}
--- a/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww
+++ b/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_ed25519_key"}}
+{{Include "keys/ssh_host_ed25519_key"}}
--- a/overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww
+++ b/overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_rsa_key.pub"}}
+{{Include "keys/ssh_host_rsa_key.pub"}}
--- a/overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww
+++ b/overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/keys/ssh_host_rsa_key"}}
+{{Include "keys/ssh_host_rsa_key"}}
--- a/overlays/wwinit/etc/warewulf/warewulf.conf.ww
+++ b/overlays/wwinit/etc/warewulf/warewulf.conf.ww
@@ -1 +1 @@
-{{Include "/etc/warewulf/warewulf.conf"}}
+{{Include "warewulf.conf"}}