diff options
| author | Jelle Licht <jlicht@fsfe.org> | 2020-05-25 20:58:46 +0200 |
|---|---|---|
| committer | Jelle Licht <jlicht@fsfe.org> | 2020-09-10 09:46:03 +0200 |
| commit | bba0533115df9a31b696ee3782c8054174b955b1 (patch) | |
| tree | 423a7e89d5bdc737120eecd8e005466a17dad856 /gnu/services | |
| parent | cafbc5f39084cff62879206d69a3890fce54dc27 (diff) | |
| download | guix-bba0533115df9a31b696ee3782c8054174b955b1.tar guix-bba0533115df9a31b696ee3782c8054174b955b1.tar.gz | |
services: php-fpm: Add 'php-ini-file' configuration.
* gnu/services/web.scm: (<php-fpm-configuration>)[php-ini-file]: New record field.
(php-fpm-shepherd-service): Use it.
* doc/guix.texi (Web Services): Document it.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/web.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/services/web.scm b/gnu/services/web.scm index d11a1c0545..c8ffc19d83 100644 --- a/gnu/services/web.scm +++ b/gnu/services/web.scm @@ -152,6 +152,7 @@ php-fpm-configuration-timezone php-fpm-configuration-workers-log-file php-fpm-configuration-file + php-fpm-configuration-php-ini-file php-fpm-dynamic-process-manager-configuration make-php-fpm-dynamic-process-manager-configuration @@ -856,6 +857,8 @@ of index files." (version-major (package-version php)) "-fpm.www.log"))) (file php-fpm-configuration-file ;#f | file-like + (default #f)) + (php-ini-file php-fpm-configuration-php-ini-file ;#f | file-like (default #f))) (define-record-type* <php-fpm-dynamic-process-manager-configuration> @@ -962,7 +965,7 @@ of index files." (match-lambda (($ <php-fpm-configuration> php socket user group socket-user socket-group pid-file log-file pm display-errors - timezone workers-log-file file) + timezone workers-log-file file php-ini-file) (list (shepherd-service (provision '(php-fpm)) (documentation "Run the php-fpm daemon.") @@ -973,7 +976,10 @@ of index files." #$(or file (default-php-fpm-config socket user group socket-user socket-group pid-file log-file - pm display-errors timezone workers-log-file))) + pm display-errors timezone workers-log-file)) + #$@(if php-ini-file + `("-c" ,php-ini-file) + '())) #:pid-file #$pid-file)) (stop #~(make-kill-destructor))))))) |