Skip to content

Commit 7b7a63f

Browse files
henderkesdunglas
andauthored
Apply suggestions from code review
Co-authored-by: Kévin Dunglas <kevin@dunglas.fr>
1 parent acf8365 commit 7b7a63f

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

caddy/frankenphp/Caddyfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# The Caddyfile is an easy way to configure your Caddy web server.
1+
# The Caddyfile is an easy way to configure FrankenPHP and the Caddy web server.
22
#
3-
# https://caddyserver.com/docs/caddyfile
43
# https://frankenphp.dev/docs/config
4+
# https://caddyserver.com/docs/caddyfile
55

66
{
77
{$CADDY_GLOBAL_OPTIONS}

docs/config.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ You can specify a custom path with the `-c` or `--config` option.
88

99
PHP itself can be configured [using a `php.ini` file](https://www.php.net/manual/en/configuration.file.php).
1010

11-
The PHP interpreter will look in the following locations:
11+
Depending on your installation method, the PHP interpreter will look for configuration files in locations described above.
1212

13-
Docker:
13+
## Docker
1414

15-
- php.ini: `/usr/local/etc/php/php.ini` No php.ini is provided by default.
15+
- `php.ini`: `/usr/local/etc/php/php.ini` (no `php.ini` is provided by default)
1616
- additional configuration files: `/usr/local/etc/php/conf.d/*.ini`
17-
- php extensions: `/usr/local/lib/php/extensions/no-debug-zts-<YYYYMMDD>/`
17+
- PHP extensions: `/usr/local/lib/php/extensions/no-debug-zts-<YYYYMMDD>/`
1818
- You should copy an official template provided by the PHP project:
1919

2020
```dockerfile
@@ -33,17 +33,17 @@ dev.Dockerfile:
3333
- additional configuration files: `/etc/frankenphp/php.d/*.ini`
3434
- php extensions: `/usr/lib/frankenphp/modules/`
3535

36-
FrankenPHP installation (.rpm or .deb):
36+
## RPM and Debian packages
3737

38-
- php.ini: `/etc/frankenphp/php.ini` A php.ini file with production presets is provided by default.
38+
- `php.ini`: `/etc/frankenphp/php.ini` (a `php.ini` file with production presets is provided by default)
3939
- additional configuration files: `/etc/frankenphp/php.d/*.ini`
40-
- php extensions: `/usr/lib/frankenphp/modules/`
40+
- PHP extensions: `/usr/lib/frankenphp/modules/`
4141

42-
Static binary:
42+
## Static binary
4343

44-
- php.ini: The directory in which `frankenphp run` or `frankenphp php-server` is executed, then `/etc/frankenphp/php.ini`
44+
- `php.ini`: The directory in which `frankenphp run` or `frankenphp php-server` is executed, then `/etc/frankenphp/php.ini`
4545
- additional configuration files: `/etc/frankenphp/php.d/*.ini`
46-
- php extensions: cannot be loaded
46+
- PHP extensions: cannot be loaded, bundle them in the binary itself
4747
- copy one of `php.ini-production` or `php.ini-development` provided [in the PHP sources](https://github.com/php/php-src/).
4848

4949
## Caddyfile Config

package/Caddyfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# The Caddyfile is an easy way to configure your Caddy web server.
1+
# The Caddyfile is an easy way to configure FrankenPHP and the Caddy web server.
22
#
3-
# https://caddyserver.com/docs/caddyfile
43
# https://frankenphp.dev/docs/config
4+
# https://caddyserver.com/docs/caddyfile
55
{
66
{$CADDY_GLOBAL_OPTIONS}
77

0 commit comments

Comments
 (0)