From 17719e2648e84cc70d0374bfc29aae33f59e933b Mon Sep 17 00:00:00 2001
From: Marek Paśnikowski <marek@marekpasnikowski.pl>
Date: Tue, 8 Oct 2024 18:45:37 +0200
Subject: refactor(izumi): isolate (certbot) service

---
 systems/izumi/izumi.scm | 57 ++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

(limited to 'systems/izumi')

diff --git a/systems/izumi/izumi.scm b/systems/izumi/izumi.scm
index 685f28c..4bca3ae 100644
--- a/systems/izumi/izumi.scm
+++ b/systems/izumi/izumi.scm
@@ -54,6 +54,35 @@
 
 ;;;???????????????????????????????????????????????????????????????????
 
+(define (certbot)
+  (service (service-type (inherit certbot-service-type)
+                         (extensions (map (lambda (extension)
+                                            (if (eq? (service-extension-target extension)
+                                                     nginx-service-type)
+                                                (service-extension nginx-service-type*
+                                                                   (@@ (gnu services certbot)
+                                                                       certbot-nginx-server-configurations))
+                                                extension))
+                                          (service-type-extensions certbot-service-type))))
+           (certbot-configuration
+            (certificates
+             (list
+              (certificate-configuration
+               (deploy-hook
+                (program-file
+                 "nginx-deploy-hook"
+                 #~
+                 (let
+                     ((pid (call-with-input-file "/var/run/nginx/pid" read)))
+                   (kill pid SIGHUP))))
+               (domains
+                (list
+                 "marekpasnikowski.pl"
+                 "git.marekpasnikowski.pl"
+                 "radicale.marekpasnikowski.pl")))))
+            (email "marek@marekpasnikowski.pl")
+            (webroot "/srv/www/marek/marekpasnikowski.pl"))))
+
 (define cgit
   (service (service-type (inherit cgit-service-type)
                          (extensions (map (lambda (extension)
@@ -420,33 +449,7 @@
      (@ (users id1000) dkim-service)
      (@ (users id1000) dovecot-service)
      (@ (users id1000) smtp-service)
-     (service (service-type (inherit certbot-service-type)
-                            (extensions (map (lambda (extension)
-                                               (if (eq? (service-extension-target extension)
-                                                        nginx-service-type)
-                                                   (service-extension nginx-service-type*
-                                                                      (@@ (gnu services certbot)
-                                                                          certbot-nginx-server-configurations))
-                                                   extension))
-                                             (service-type-extensions certbot-service-type))))
-              ( certbot-configuration
-                ( certificates
-                  ( list
-                    ( certificate-configuration
-                      ( deploy-hook
-                        ( program-file
-                          "nginx-deploy-hook"
-                          #~
-                          ( let
-                              ( ( pid ( call-with-input-file "/var/run/nginx/pid" read ) ) )
-                            ( kill pid SIGHUP ) ) ) )
-                      ( domains
-                        ( list
-                          "marekpasnikowski.pl"
-                          "git.marekpasnikowski.pl"
-                          "radicale.marekpasnikowski.pl" ) ) ) ) )
-                ( email "marek@marekpasnikowski.pl" )
-                ( webroot "/srv/www/marek/marekpasnikowski.pl" ) ) )
+     (certbot)
      cgit
      (etc-mailname)
      (fcgiwrap)
-- 
cgit v1.2.3