GNU bug report logs - #66360
[PATCH] doc: Use herd for cerbot deploy hook example.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 66360 in the body.
You can then email your comments to 66360 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Bruno Victal <mirai <at> makinata.eu>
To: guix-patches <at> gnu.org
Cc: Bruno Victal <mirai <at> makinata.eu>
Subject: [PATCH] doc: Use herd for cerbot deploy hook example.
Date: Thu,  5 Oct 2023 14:20:49 +0100

* doc/guix.texi (Certificate Services): Replace PID file based example with
one using (gnu services herd). Rename %nginx-deploy-hook to
%certbot-deploy-hook.
---
 doc/guix.texi | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 8c5697589f..c54bfc0154 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -31935,11 +31935,12 @@ Certificate Services
 must be a @code{certbot-configuration} record as in this example:
 
 @lisp
-(define %nginx-deploy-hook
-  (program-file
-   "nginx-deploy-hook"
-   #~(let ((pid (call-with-input-file "/var/run/nginx/pid" read)))
-       (kill pid SIGHUP))))
+(define %certbot-deploy-hook
+  (program-file "certbot-deploy-hook.scm"
+    (with-imported-modules '((gnu services herd))
+      #~(begin
+          (use-modules (gnu services herd))
+          (with-shepherd-action 'nginx ('reload) result result)))))
 
 (service certbot-service-type
          (certbot-configuration
@@ -31948,7 +31949,7 @@ Certificate Services
            (list
             (certificate-configuration
              (domains '("example.net" "www.example.net"))
-             (deploy-hook %nginx-deploy-hook))
+             (deploy-hook %certbot-deploy-hook))
             (certificate-configuration
              (domains '("bar.example.net")))))))
 @end lisp

base-commit: 044a76c280c26b8ea731c4367d74474805b7257a
-- 
2.41.0

Message #10 received at 66360-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Bruno Victal <mirai <at> makinata.eu>
Cc: 66360-done <at> debbugs.gnu.org
Subject: Re: [bug#66360] [PATCH] doc: Use herd for cerbot deploy hook example.
Date: Sat, 14 Oct 2023 22:28:59 +0200

Hi,

Bruno Victal <mirai <at> makinata.eu> skribis:

> * doc/guix.texi (Certificate Services): Replace PID file based example with
> one using (gnu services herd). Rename %nginx-deploy-hook to
> %certbot-deploy-hook.

Applied, thanks!

> +(define %certbot-deploy-hook
> +  (program-file "certbot-deploy-hook.scm"
> +    (with-imported-modules '((gnu services herd))
> +      #~(begin
> +          (use-modules (gnu services herd))
> +          (with-shepherd-action 'nginx ('reload) result result)))))

Should we make it the default ‘deploy-hook’ value in
<certificate-configuration>?  I’ve always been frustrated that
‘certbot-service-type’ doesn’t quite work out of the box.

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.