Skip to content

filesystem changes #6466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
elee1766 wants to merge 7 commits into from
Closed

filesystem changes #6466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
06ed6fc
change name
elee1766 Jul 21, 2024
e94663b
Merge branch 'master' into filesystem-changes
elee1766 Jul 21, 2024
6e3abf3
unwrap
elee1766 Jul 21, 2024
447066e
noot
elee1766 Sep 17, 2024
98ad0a1
noot
elee1766 Sep 17, 2024
cf637db
Merge branch 'master' into filesystem-changes
elee1766 Sep 17, 2024
07a21a8
noot
elee1766 Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion caddyconfig/httpcaddyfile/httptype.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ func (st ServerType) Setup(
cfg.AppsRaw["pki"] = caddyconfig.JSON(pkiApp, &warnings)
}
if filesystems, ok := options["filesystem"].(caddy.Module); ok {
cfg.AppsRaw["caddy.filesystems"] = caddyconfig.JSON(
cfg.AppsRaw["file_systems"] = caddyconfig.JSON(
filesystems,
&warnings)
}
Expand Down
4 changes: 4 additions & 0 deletions internal/filesystems/map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ type wrapperFs struct {
fs.FS
}

func (w *wrapperFs) Unwrap() fs.FS {
return w.FS
}

// FilesystemMap stores a map of filesystems
// the empty key will be overwritten to be the default key
// it includes a default filesystem, based off the os fs
Expand Down
6 changes: 3 additions & 3 deletions modules/caddyfs/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ func init() {

type moduleEntry struct {
Key string `json:"name,omitempty"`
FileSystemRaw json.RawMessage `json:"file_system,omitempty" caddy:"namespace=caddy.fs inline_key=backend"`
FileSystemRaw json.RawMessage `json:"filesystem,omitempty" caddy:"namespace=caddy.fs inline_key=backend"`
Copy link
Copy Markdown
Member

@mholt mholt Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FileSystemRaw json.RawMessage `json:"filesystem,omitempty" caddy:"namespace=caddy.fs inline_key=backend"`
FileSystemRaw json.RawMessage `json:"file_system,omitempty" caddy:"namespace=caddy.fs inline_key=backend"`

Copy link
Copy Markdown
Member

@francislavoie francislavoie Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

huh? The point of this PR is to fix that, but you're suggesting reverting the fix back to status-quo. I'm confused.

Copy link
Copy Markdown
Member

@mholt mholt Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, well I thought we agreed it was two words: #6466 (comment) (see also next comment)

Copy link
Copy Markdown
Contributor Author

@elee1766 elee1766 Oct 1, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i changed this in other places (see httptype.go), but i did not change it here in fear of breaking existing caddyfiles.

fileSystem fs.FS
}

// Filesystems loads caddy.fs modules into the global filesystem map
type Filesystems struct {
Filesystems []*moduleEntry `json:"filesystems"`
Filesystems []*moduleEntry `json:"file_systems"`

defers []func()
}
Expand All @@ -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: "caddy.filesystems",
ID: "file_systems",
New: func() caddy.Module { return new(Filesystems) },
}
}
Expand Down