From 673d7627b5d25e326a92963fe77715f8bf246c73 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Tue, 17 Feb 2026 13:50:55 -0700 Subject: [PATCH] Move TLS files from keys/ to tls/ Signed-off-by: Jonathon Anderson --- internal/app/wwclient/root.go | 2 +- internal/app/wwctl/configure/main.go | 2 +- internal/app/wwctl/configure/tls/main.go | 2 +- internal/app/wwctl/configure/tls/main_test.go | 2 +- internal/pkg/configure/tls.go | 2 +- internal/pkg/warewulfd/server/server.go | 6 +++--- .../wwinit/rootfs/warewulf/{keys => tls}/warewulf.crt.ww | 2 +- userdocs/server/security.rst | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) rename overlays/wwinit/rootfs/warewulf/{keys => tls}/warewulf.crt.ww (61%) diff --git a/internal/app/wwclient/root.go b/internal/app/wwclient/root.go index 5d654f79..b14c0279 100644 --- a/internal/app/wwclient/root.go +++ b/internal/app/wwclient/root.go @@ -118,7 +118,7 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) { tlsConfig := &tls.Config{} if conf.Warewulf.EnableTLS() { - caCert, err := os.ReadFile("/warewulf/keys/warewulf.crt") + caCert, err := os.ReadFile("/warewulf/tls/warewulf.crt") if err != nil { wwlog.Error("failed to read ca cert: %s", err) return err diff --git a/internal/app/wwctl/configure/main.go b/internal/app/wwctl/configure/main.go index 5eef8905..5532a197 100644 --- a/internal/app/wwctl/configure/main.go +++ b/internal/app/wwctl/configure/main.go @@ -23,7 +23,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } if allFunctions { - keystore := path.Join(conf.Paths.Sysconfdir, "warewulf", "keys") + keystore := path.Join(conf.Paths.Sysconfdir, "warewulf", "tls") keyFile := path.Join(keystore, "warewulf.key") certFile := path.Join(keystore, "warewulf.crt") diff --git a/internal/app/wwctl/configure/tls/main.go b/internal/app/wwctl/configure/tls/main.go index b9cdfea7..bffc4147 100644 --- a/internal/app/wwctl/configure/tls/main.go +++ b/internal/app/wwctl/configure/tls/main.go @@ -17,7 +17,7 @@ import ( func CobraRunE(cmd *cobra.Command, args []string) error { conf := config.Get() - keystore := path.Join(conf.Paths.Sysconfdir, "warewulf", "keys") + keystore := path.Join(conf.Paths.Sysconfdir, "warewulf", "tls") if err := os.MkdirAll(keystore, 0755); err != nil { return fmt.Errorf("could not create keystore directory: %w", err) diff --git a/internal/app/wwctl/configure/tls/main_test.go b/internal/app/wwctl/configure/tls/main_test.go index ae3bb300..3c5b20f0 100644 --- a/internal/app/wwctl/configure/tls/main_test.go +++ b/internal/app/wwctl/configure/tls/main_test.go @@ -15,7 +15,7 @@ func Test_Keys(t *testing.T) { defer env.RemoveAll() // Define a keystore path within the test environment - keystoreRelPath := "etc/warewulf/keys" + keystoreRelPath := "etc/warewulf/tls" keystorePath := env.GetPath(keystoreRelPath) // Reload configuration to pick up the change diff --git a/internal/pkg/configure/tls.go b/internal/pkg/configure/tls.go index 1e753482..1df303ff 100644 --- a/internal/pkg/configure/tls.go +++ b/internal/pkg/configure/tls.go @@ -22,7 +22,7 @@ GenTLSKeys checks for existence of x509 keys and creates them if they don't exis */ func GenTLSKeys() error { conf := warewulfconf.Get() - keystore := path.Join(conf.Paths.Sysconfdir, "warewulf", "keys") + keystore := path.Join(conf.Paths.Sysconfdir, "warewulf", "tls") keyFile := path.Join(keystore, "warewulf.key") certFile := path.Join(keystore, "warewulf.crt") diff --git a/internal/pkg/warewulfd/server/server.go b/internal/pkg/warewulfd/server/server.go index e9153cda..18743f73 100644 --- a/internal/pkg/warewulfd/server/server.go +++ b/internal/pkg/warewulfd/server/server.go @@ -89,11 +89,11 @@ func RunServer() error { httpHandler := configureHandler(!conf.Warewulf.EnableTLS(), apiHandler) if conf.Warewulf.EnableTLS() { - key := path.Join(conf.Paths.Sysconfdir, "warewulf", "keys", "warewulf.key") - crt := path.Join(conf.Paths.Sysconfdir, "warewulf", "keys", "warewulf.crt") + key := path.Join(conf.Paths.Sysconfdir, "warewulf", "tls", "warewulf.key") + crt := path.Join(conf.Paths.Sysconfdir, "warewulf", "tls", "warewulf.crt") if !util.IsFile(key) || !util.IsFile(crt) { - wwlog.Error("TLS enabled but keys not found in %s", path.Join(conf.Paths.Sysconfdir, "warewulf", "keys")) + wwlog.Error("TLS enabled but keys not found in %s", path.Join(conf.Paths.Sysconfdir, "warewulf", "tls")) } else { httpsHandler := configureHandler(true, apiHandler) go func() { diff --git a/overlays/wwinit/rootfs/warewulf/keys/warewulf.crt.ww b/overlays/wwinit/rootfs/warewulf/tls/warewulf.crt.ww similarity index 61% rename from overlays/wwinit/rootfs/warewulf/keys/warewulf.crt.ww rename to overlays/wwinit/rootfs/warewulf/tls/warewulf.crt.ww index 8f984c66..bff0aa28 100644 --- a/overlays/wwinit/rootfs/warewulf/keys/warewulf.crt.ww +++ b/overlays/wwinit/rootfs/warewulf/tls/warewulf.crt.ww @@ -1,4 +1,4 @@ -{{- $crt := Include "keys/warewulf.crt" -}} +{{- $crt := Include "tls/warewulf.crt" -}} {{- if eq $crt "" -}} {{ abort }} {{- else -}} diff --git a/userdocs/server/security.rst b/userdocs/server/security.rst index 139b0388..a2109f4b 100644 --- a/userdocs/server/security.rst +++ b/userdocs/server/security.rst @@ -106,8 +106,8 @@ keys and certificate are stored if not configured otherwise as .. code-block:: console .. -.. /etc/warewulf/keys/warewulf.crt # PEM certificate -.. /etc/warewulf/keys/warewulf.key # PEM RSA Key +.. /etc/warewulf/tls/warewulf.crt # PEM certificate +.. /etc/warewulf/tls/warewulf.key # PEM RSA Key