kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Properly support relative paths to the SYSCONFDIR

Browse Source
This commit is contained in:
Gregory Kurtzer
2022-01-26 03:46:39 +00:00
parent af32998c2b
commit 2d880aae76
10 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/pkg/overlay/funcmap.go
View File

@@ -5,14 +5,18 @@ import (
"path" "path"
"strings" "strings"
"github.com/hpcng/warewulf/internal/pkg/buildconfig"
"github.com/hpcng/warewulf/internal/pkg/container" "github.com/hpcng/warewulf/internal/pkg/container"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
) )
func templateFileInclude(path string) string { func templateFileInclude(inc string) string {
wwlog.Printf(wwlog.DEBUG, "Including file into template: %s\n", path) if !strings.HasPrefix(inc, "/") {
content, err := ioutil.ReadFile(path) inc = path.Join(buildconfig.SYSCONFDIR(), "warewulf", inc)
}
wwlog.Printf(wwlog.DEBUG, "Including file into template: %s\n", inc)
content, err := ioutil.ReadFile(inc)
if err != nil { if err != nil {
wwlog.Printf(wwlog.VERBOSE, "Could not include file into template: %s\n", err) wwlog.Printf(wwlog.VERBOSE, "Could not include file into template: %s\n", err)
} }

2
overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/keys/ssh_host_dsa_key.pub"}} {{Include "keys/ssh_host_dsa_key.pub"}}

2
overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/keys/ssh_host_dsa_key"}} {{Include "keys/ssh_host_dsa_key"}}

2
overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/keys/ssh_host_ecdsa_key.pub"}} {{Include "keys/ssh_host_ecdsa_key.pub"}}

2
overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/keys/ssh_host_ecdsa_key"}} {{Include "keys/ssh_host_ecdsa_key"}}

2
overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/keys/ssh_host_ed25519_key.pub"}} {{Include "keys/ssh_host_ed25519_key.pub"}}

2
overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/keys/ssh_host_ed25519_key"}} {{Include "keys/ssh_host_ed25519_key"}}

2
overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/keys/ssh_host_rsa_key.pub"}} {{Include "keys/ssh_host_rsa_key.pub"}}

2
overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/keys/ssh_host_rsa_key"}} {{Include "keys/ssh_host_rsa_key"}}

2
overlays/wwinit/etc/warewulf/warewulf.conf.ww
View File

@@ -1 +1 @@
{{Include "/etc/warewulf/warewulf.conf"}} {{Include "warewulf.conf"}}