From 447066e7c2c5b0e792a0f1cfac8991e40213c366 Mon Sep 17 00:00:00 2001
From: a <a@tuxpa.in>
Date: Tue, 17 Sep 2024 16:28:33 -0500
Subject: [PATCH] noot

---
 caddyconfig/httpcaddyfile/httptype.go | 4 ++--
 modules/caddyfs/filesystem.go         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/caddyconfig/httpcaddyfile/httptype.go b/caddyconfig/httpcaddyfile/httptype.go
index 5d8190c34..5089caef7 100644
--- a/caddyconfig/httpcaddyfile/httptype.go
+++ b/caddyconfig/httpcaddyfile/httptype.go
@@ -274,8 +274,8 @@ func (st ServerType) Setup(
 	if !reflect.DeepEqual(pkiApp, &caddypki.PKI{CAs: make(map[string]*caddypki.CA)}) {
 		cfg.AppsRaw["pki"] = caddyconfig.JSON(pkiApp, &warnings)
 	}
-	if filesystems, ok := options["filesystem"].(caddy.Module); ok {
-		cfg.AppsRaw["filesystems"] = caddyconfig.JSON(
+	if filesystems, ok := options["file_systems"].(caddy.Module); ok {
+		cfg.AppsRaw["file_systems"] = caddyconfig.JSON(
 			filesystems,
 			&warnings)
 	}
diff --git a/modules/caddyfs/filesystem.go b/modules/caddyfs/filesystem.go
index 069949fa5..fdb9e7815 100644
--- a/modules/caddyfs/filesystem.go
+++ b/modules/caddyfs/filesystem.go
@@ -15,7 +15,7 @@ import (
 
 func init() {
 	caddy.RegisterModule(Filesystems{})
-	httpcaddyfile.RegisterGlobalOption("filesystem", parseFilesystems)
+	httpcaddyfile.RegisterGlobalOption("file_systems", parseFilesystems)
 }
 
 type moduleEntry struct {
@@ -26,7 +26,7 @@ type moduleEntry struct {
 
 // Filesystems loads caddy.fs modules into the global filesystem map
 type Filesystems struct {
-	Filesystems []*moduleEntry `json:"filesystems"`
+	Filesystems []*moduleEntry `json:"file_systems"`
 
 	defers []func()
 }
@@ -49,7 +49,7 @@ func parseFilesystems(d *caddyfile.Dispenser, existingVal any) (any, error) {
 // CaddyModule returns the Caddy module information.
 func (Filesystems) CaddyModule() caddy.ModuleInfo {
 	return caddy.ModuleInfo{
-		ID:  "filesystems",
+		ID:  "file_systems",
 		New: func() caddy.Module { return new(Filesystems) },
 	}
 }