bug#62642: closed ([PATCH] services: certbot: Fix nginx crash when certbot is used without domains)

[GNU bug Tracking System]

Your message dated Sun, 18 Jun 2023 23:11:56 +0200
with message-id <877cs0pjab.fsf_-_@gnu.org>
and subject line Re: bug#62642: [PATCH] services: certbot: Fix nginx crash when 
certbot is used without domains
has caused the debbugs.gnu.org bug report #62642,
regarding [PATCH] services: certbot: Fix nginx crash when certbot is used 
without domains
to be marked as done.

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


-- 
62642: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62642
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH] services: certbot: Fix nginx crash when certbot is used without domains
>
>
>
>
> Date: 
>
> Mon,  3 Apr 2023 16:32:41 +0300
>
>
>
>
> * gnu/services/certbot.scm (certbot-nginx-server-configurations):
> Don't return a broken nginx-server-configuration when no certificate
> domains are configured.
> ---
>  gnu/services/certbot.scm | 29 +++++++++++++++--------------
>  1 file changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/gnu/services/certbot.scm b/gnu/services/certbot.scm
> index 8e6784df2b..3d9d207f8a 100644
> --- a/gnu/services/certbot.scm
> +++ b/gnu/services/certbot.scm
> @@ -173,20 +173,21 @@ (define certbot-nginx-server-configurations
>    (match-lambda
>      (($ <certbot-configuration> package webroot certificates email
>                                  server rsa-key-size default-location)
> -     (list
> -      (nginx-server-configuration
> -       (listen '("80" "[::]:80"))
> -       (ssl-certificate #f)
> -       (ssl-certificate-key #f)
> -       (server-name
> -        (apply append (map certificate-configuration-domains certificates)))
> -       (locations
> -        (filter identity
> -                (list
> -                 (nginx-location-configuration
> -                  (uri "/.well-known")
> -                  (body (list (list "root " webroot ";"))))
> -                 default-location))))))))
> +     (if (null? certificates) '()
> +       (list
> +        (nginx-server-configuration
> +        (listen '("80" "[::]:80"))
> +        (ssl-certificate #f)
> +        (ssl-certificate-key #f)
> +        (server-name
> +         (apply append (map certificate-configuration-domains certificates)))
> +        (locations
> +         (filter identity
> +                 (list
> +                  (nginx-location-configuration
> +                   (uri "/.well-known")
> +                   (body (list (list "root " webroot ";"))))
> +                  default-location)))))))))
>  
>  (define certbot-service-type
>    (service-type (name 'certbot)
>
> base-commit: 2cf71e725d55bc5bf1ad663b7c696516299cc8a7
> -- 
> 2.39.2
>
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: bug#62642: [PATCH] services: certbot: Fix nginx crash when certbot is used without domains
>
>
>
>
> Date: 
>
> Sun, 18 Jun 2023 23:11:56 +0200
>
>
>
>
> User-agent: 
>
> Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux)
>
>
>
>
> Hi Saku,
>
> Saku Laesvuori <saku@laesvuori.fi> skribis:
>
> > * gnu/services/certbot.scm (certbot-nginx-server-configurations):
> > Don't return a broken nginx-server-configuration with empty server_name
> > when no certificate domains are configured. Instead add a separate
> > server for every certificate, so 0 certificates adds 0 servers.
>
> Finally applied.
>
> Thank you, and thanks to Bruno for reviewing!
>
> Ludo’.
>
>
> --- End Message ---