summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deployment/services/certbot.scm68
-rw-r--r--deployment/services/cgit.scm29
-rw-r--r--deployment/services/version-control.scm16
-rw-r--r--deployment/services/web.scm59
-rw-r--r--deployment/system.scm8
5 files changed, 102 insertions, 78 deletions
diff --git a/deployment/services/certbot.scm b/deployment/services/certbot.scm
new file mode 100644
index 0000000..4725b31
--- /dev/null
+++ b/deployment/services/certbot.scm
@@ -0,0 +1,68 @@
+;;; SPDX-License-Identifier: GPL-3.0-or-later
+;;; SPDX-FileCopyrightText: 2024-2026 Marek Paśnikowski <marek@marekpasnikowski.pl>
+
+(define-module (deployment services certbot)
+ #:export (aisaka-certbot-service)
+ #:use-module (gnu services)
+ #:use-module (gnu services certbot)
+ #:use-module (guix gexp)
+ #:use-module ((deployment services web)
+ #:prefix deployment:services:web:)
+ #:use-module ((gnu services web)
+ #:prefix gnu:services:web:))
+
+(define nginx-extension-of-certbot
+ (service-extension deployment:services:web: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-
+ gnu:services:web:nginx-service-type)))
+ (if nginx-service-type?-
+ nginx-extension-of-certbot
+ extension)))
+
+(define certbot-type
+ (let
+ ((certbot-extensions- (service-type-extensions certbot-service-type)))
+ (service-type
+ (inherit 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 aisaka-certificate-configuration
+ (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 aisaka-certbot-configuration
+ (certbot-configuration
+ (certificates (list aisaka-certificate-configuration))
+ (email "marek@marekpasnikowski.pl")
+ (webroot "/srv/www/marek/marekpasnikowski.pl")))
+
+(define aisaka-certbot-service
+ (service certbot-type
+ aisaka-certbot-configuration))
+
+;;; EOF
diff --git a/deployment/services/cgit.scm b/deployment/services/cgit.scm
index 8ff6662..e44252f 100644
--- a/deployment/services/cgit.scm
+++ b/deployment/services/cgit.scm
@@ -6,6 +6,8 @@
#:use-module (gnu services)
#:use-module (gnu services cgit)
#:use-module (gnu services web)
+ #:use-module ((deployment services version-control)
+ #:prefix deployment:services:version-control:)
#:use-module ((deployment services web)
#:prefix deployment:services:web:)
#:use-module ((gnu packages version-control)
@@ -18,11 +20,6 @@
(hide? #t)
(path "/srv/git/marek/packages")))
-(define git-http-configuration
- (gnu:services:version-control:git-http-configuration
- (git-root "/var/lib/gitolite/repositories")
- (uri-path "/git")))
-
(define nginx-location-cgit
(nginx-location-configuration
(body (list "fastcgi_param HTTP_HOST $server_name ;"
@@ -33,18 +30,16 @@
(uri "@cgit")))
(define nginx-server-cgit
- (let
- ((git-http- (gnu:services:version-control:git-http-nginx-location-configuration git-http-configuration)))
- (nginx-server-configuration
- (locations (list git-http-
- nginx-location-cgit
- deployment:services:web:nginx-location-well-known))
- (listen (list "192.168.10.2:443 ssl"))
- (root gnu:packages:version-control:cgit)
- (server-name (list "git.marekpasnikowski.pl"))
- (ssl-certificate "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem")
- (ssl-certificate-key "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem")
- (try-files (list "$uri" "@cgit")))))
+ (nginx-server-configuration
+ (locations (list deployment:services:version-control:aisaka-git-http-nginx-location
+ nginx-location-cgit
+ deployment:services:web:nginx-location-well-known))
+ (listen (list "192.168.10.2:443 ssl"))
+ (root gnu:packages:version-control:cgit)
+ (server-name (list "git.marekpasnikowski.pl"))
+ (ssl-certificate "/etc/letsencrypt/live/marekpasnikowski.pl/fullchain.pem")
+ (ssl-certificate-key "/etc/letsencrypt/live/marekpasnikowski.pl/privkey.pem")
+ (try-files (list "$uri" "@cgit"))))
(define nginx-extension-of-cgit
(service-extension deployment:services:web:nginx-service-type*
diff --git a/deployment/services/version-control.scm b/deployment/services/version-control.scm
new file mode 100644
index 0000000..6044e22
--- /dev/null
+++ b/deployment/services/version-control.scm
@@ -0,0 +1,16 @@
+;;; SPDX-License-Identifier: GPL-3.0-or-later
+;;; SPDX-FileCopyrightText: 2024-2026 Marek Paśnikowski <marek@marekpasnikowski.pl>
+
+(define-module (deployment services version-control)
+ #:export (aisaka-git-http-nginx-location)
+ #:use-module (gnu services version-control))
+
+(define aisaka-git-http-configuration
+ (git-http-configuration
+ (git-root "/var/lib/gitolite/repositories")
+ (uri-path "/git")))
+
+(define-public aisaka-git-http-nginx-location
+ (git-http-nginx-location-configuration aisaka-git-http-configuration))
+
+;;; EOF
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 <marek@marekpasnikowski.pl>
(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
diff --git a/deployment/system.scm b/deployment/system.scm
index bf5b143..2ed8d4f 100644
--- a/deployment/system.scm
+++ b/deployment/system.scm
@@ -1,12 +1,14 @@
(define-module (deployment system)
+ #:use-module ((deployment services certbot)
+ #:prefix deployment:services:certbot:)
#:use-module ((deployment services cgit)
#:prefix deployment:services:cgit:)
#:use-module ((deployment services databases)
#:prefix deployment:services:databases:)
- #:use-module ((deployment services web)
- #:prefix deployment:services:web:)
#:use-module ((deployment services dns)
#:prefix deployment:services:dns:)
+ #:use-module ((deployment services web)
+ #:prefix deployment:services:web:)
#:use-module ((deployment services matrix)
#:prefix deployment:services:matrix:)
#:use-module ((deployment system aisaka)
@@ -93,7 +95,7 @@
(locale-libcs gnu:system:locale:%default-locale-libcs)
(name-service-switch gnu:system:nss:%default-nss)
(essential-services (gnu:system:operating-system-default-essential-services gnu:system:this-operating-system))
- (services (cons* deployment:services:web:aisaka-certbot-service
+ (services (cons* deployment:services:certbot:aisaka-certbot-service
deployment:services:cgit:aisaka-cgit-service
users:id1000:dkim-service
users:id1000:dovecot-service
generated by cgit v1.3 (git 2.53.0) at 2026-04-26 01:38:10 +0000