Skip to content

docs: Fix file extension in FrankenPHP configuration#2067

Merged
henderkes merged 2 commits intophp:mainfrom
francislavoie:patch-1
Dec 11, 2025
Merged

docs: Fix file extension in FrankenPHP configuration#2067
henderkes merged 2 commits intophp:mainfrom
francislavoie:patch-1

Conversation

@francislavoie
Copy link
Contributor

Corrected the file extension for additional configuration files in FrankenPHP section.

Corrected the file extension for additional configuration files in FrankenPHP section.

Signed-off-by: Francis Lavoie <lavofr@gmail.com>
@henderkes
Copy link
Contributor

I could swear we have an open PR for this (the path is incorrect too).

@francislavoie
Copy link
Contributor Author

Ah, 7b8cf6b only touched one but not the other

@henderkes
Copy link
Contributor

#2059 seems like it missed an occurrence.

The path must be /etc/frankenphp/Caddyfile.d/*.caddyfile

Copy link
Contributor

@henderkes henderkes left a comment

Choose a reason for hiding this comment

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

Hah, you were too fast. Thank you.

@henderkes henderkes merged commit d200762 into php:main Dec 11, 2025
1 check passed
@dunglas
Copy link
Member

dunglas commented Dec 11, 2025

.caddyfile or .Caddyfile? In Mercure we use .Caddyfile.

@francislavoie
Copy link
Contributor Author

@dunglas

import Caddyfile.d/*.caddyfile

@francislavoie francislavoie deleted the patch-1 branch December 11, 2025 20:54
@henderkes
Copy link
Contributor

I chose Caddyfile.d/*.caddyfile because that's what Caddy's copr and deb packages use. There's also some distribution that uses caddy.d/*.caddy though and I also saw *.Caddyfile.

It's a bit of a mess, like php's paths differing between apt, apk and dnf distributions. I therefore chose those based on a majority concept (i.e. conf.d instead of php.d because that's what apt + apk use) .

@francislavoie
Copy link
Contributor Author

Caddy allows for Caddyfile* or *.caddyfile when used as the main config file, as per https://github.com/caddyserver/caddy/blob/6a4296b1a45d81f52bf8ab01d0bcaa4423fee3ff/cmd/main.go#L123. What's used for import doesn't really matter, but IMO .caddyfile is perfectly fine. Lowercase for extension is most sensible I think.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants