From de2a7b0a9f30a76219d47aabf30e0adda39f20ee Mon Sep 17 00:00:00 2001 From: Marek Paśnikowski Date: Sat, 25 Apr 2026 11:56:56 +0200 Subject: (services): export certbot related definitions to a dedicated module --- deployment/services/web.scm | 59 +-------------------------------------------- 1 file changed, 1 insertion(+), 58 deletions(-) (limited to 'deployment/services/web.scm') diff --git a/deployment/services/web.scm b/deployment/services/web.scm index fe03e90..062e149 100644 --- a/deployment/services/web.scm +++ b/deployment/services/web.scm @@ -2,8 +2,7 @@ ;;; SPDX-FileCopyrightText: 2024-2026 Marek Paśnikowski (define-module (deployment services web) - #:export (aisaka-certbot-service - aisaka-nginx-service + #:export (aisaka-nginx-service nginx-location-well-known nginx-service-type*) #:use-module (gnu services) @@ -11,8 +10,6 @@ #:use-module (guix gexp) #:use-module ((gnu packages matrix) #:prefix gnu:packages:matrix:) - #:use-module ((gnu services certbot) - #:prefix gnu:services:certbot:) #:use-module ((gnu system shadow) #:prefix gnu:system:shadow:) #:use-module ((sovereign system accounts) @@ -186,58 +183,4 @@ (service nginx-service-type* nginx-configuration*)) -(define nginx-extension-of-certbot - (service-extension nginx-service-type* - (@@ (gnu services certbot) - certbot-nginx-server-configurations))) - -(define (extend-certbot extension) - (let* - ((extension-target- (service-extension-target extension)) - (nginx-service-type?- (eq? extension-target- - nginx-service-type))) - (if nginx-service-type?- - nginx-extension-of-certbot - extension))) - -(define certbot-type - (let - ((certbot-extensions- (service-type-extensions gnu:services:certbot:certbot-service-type))) - (service-type - (inherit gnu:services:certbot:certbot-service-type) - (extensions (map extend-certbot - certbot-extensions-))))) - -(define nginx-deploy-hook-file - #~(let - ((pid (call-with-input-file "/var/run/nginx/pid" - read))) - (kill pid - SIGHUP))) - -(define certificate-configuration - (gnu:services:certbot:certificate-configuration - (deploy-hook (program-file "nginx-deploy-hook" - nginx-deploy-hook-file)) - (domains (list "marekpasnikowski.pl" - "git.marekpasnikowski.pl" - "guix.marekpasnikowski.pl" - "matrix.marekpasnikowski.pl" - "mx.marekpasnikowski.pl" - "radicale.marekpasnikowski.pl" - "schron.marekpasnikowski.pl" - "sejf.marekpasnikowski.pl" - "test.marekpasnikowski.pl" - "www.marekpasnikowski.pl")))) - -(define certbot-configuration - (gnu:services:certbot:certbot-configuration - (certificates (list certificate-configuration)) - (email "marek@marekpasnikowski.pl") - (webroot "/srv/www/marek/marekpasnikowski.pl"))) - -(define aisaka-certbot-service - (service certbot-type - certbot-configuration)) - ;;; EOF -- cgit v1.3