bug#41529: closed ([PATCH] services: php-fpm: Add 'php-ini-file' configuration.)

[GNU bug Tracking System]

Your message dated Thu, 10 Sep 2020 09:49:23 +0200
with message-id <87sgbqrrzw.fsf@jlicht.xyz>
and subject line Re: [bug#41529] [PATCH v2] services: php-fpm: Add 
'php-ini-file' configuration.
has caused the debbugs.gnu.org bug report #41529,
regarding [PATCH] services: php-fpm: Add 'php-ini-file' configuration.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
41529: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=41529
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] services: php-fpm: Add 'php-ini-file' configuration.
>
>
>
>
> Date: 
>
> Mon, 25 May 2020 18:48:45 +0200
>
>
>
>
> * 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.
> ---
>  doc/guix.texi        |  4 ++++
>  gnu/services/web.scm | 10 ++++++++--
>  2 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 3d1b097447..82ea7ae852 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -21370,6 +21370,10 @@ Can be set to @code{#f} to disable logging.
>  @item @code{file} (default @code{#f})
>  An optional override of the whole configuration.
>  You can use the @code{mixed-text-file} function or an absolute filepath for it.
> +@item @code{php-ini-file} (default @code{#f})
> +An optional override of the default php settings.
> +It may be any ``file-like'' object (@pxref{G-Expressions, file-like objects}).
> +You can use the @code{mixed-text-file} function or an absolute filepath for it.
>  @end table
>  @end deftp
>  
> diff --git a/gnu/services/web.scm b/gnu/services/web.scm
> index 9fcfe8a0dc..7cc53ef12f 100644
> --- a/gnu/services/web.scm
> +++ b/gnu/services/web.scm
> @@ -159,6 +159,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>
>              php-fpm-dynamic-process-manager-configuration
> @@ -857,6 +858,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>
> @@ -963,7 +966,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.")
> @@ -974,7 +977,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)))))))
>  
> -- 
> 2.26.2
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [bug#41529] [PATCH v2] services: php-fpm: Add 'php-ini-file' configuration.
>
>
>
>
> Date: 
>
> Thu, 10 Sep 2020 09:49:23 +0200
>
>
>
>
> Ludovic Courtès <ludo@gnu.org> writes:
> >
> > Jelle Licht <jlicht@fsfe.org> skribis:
> >
> >> * 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.
> >
> > It’s been a long time already and I think you can go ahead and push it.
>
> pushed as bba0533115df9a31b696ee3782c8054174b955b1 to master.
>
>
> --- End Message ---