about summary refs log tree commit diff
diff options
context:
space:
mode:
authorArun Isaac2023-12-19 16:51:31 +0000
committerArun Isaac2023-12-19 16:51:31 +0000
commit20dc05124c97bf7b0e9f188d13a94cd98ec03d8a (patch)
treea5868bd205ed139c6de5448be66e4b5b07c00cc2
parentb911f4c3217629b63ebfa2385e9f4a09a7278d1c (diff)
downloadguix-forge-20dc05124c97bf7b0e9f188d13a94cd98ec03d8a.tar.gz
guix-forge-20dc05124c97bf7b0e9f188d13a94cd98ec03d8a.tar.lz
guix-forge-20dc05124c97bf7b0e9f188d13a94cd98ec03d8a.zip
acme: Combine deploy hooks into a file-like object, not a raw G-exp.
* guix/forge/acme.scm (acme-service-type): Combine deploy hooks into a
file-like object, not a raw G-expression.
-rw-r--r--guix/forge/acme.scm14
1 files changed, 8 insertions, 6 deletions
diff --git a/guix/forge/acme.scm b/guix/forge/acme.scm
index 4142fe2..5ec27bb 100644
--- a/guix/forge/acme.scm
+++ b/guix/forge/acme.scm
@@ -496,12 +496,14 @@ unspecified. If no element matching @var{pred} is found, return
                                       ;; Combine deploy hooks of the
                                       ;; two certificates.
                                       (deploy-hook
-                                       (with-imported-modules '((guix build utils))
-                                         #~(begin
-                                             (use-modules (guix build utils))
-
-                                             (invoke #$(acme-certificate-deploy-hook certificate))
-                                             (invoke #$(acme-certificate-deploy-hook matched-certificate))))))
+                                       (program-file (string-append (first (acme-certificate-domains certificate))
+                                                                    "-certificate-deploy-hook")
+                                                     (with-imported-modules '((guix build utils))
+                                                       #~(begin
+                                                           (use-modules (guix build utils))
+
+                                                           (invoke #$(acme-certificate-deploy-hook certificate))
+                                                           (invoke #$(acme-certificate-deploy-hook matched-certificate)))))))
                                      other-certificates))))
                         (else
                          (cons certificate previous-certificates))))