diff options
Diffstat (limited to 'deployment/system/aisaka.scm')
| -rw-r--r-- | deployment/system/aisaka.scm | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/deployment/system/aisaka.scm b/deployment/system/aisaka.scm index d8c5e35..fc2e35c 100644 --- a/deployment/system/aisaka.scm +++ b/deployment/system/aisaka.scm @@ -2,6 +2,7 @@ ;;; SPDX-FileCopyrightText: 2024-2026 Marek Paśnikowski <marek@marekpasnikowski.pl> (define-module (deployment system aisaka) + #:use-module (gnu services dns) #:use-module (guix gexp) #:use-module ((deployment gexp) #:prefix deployment:gexp:) @@ -25,8 +26,6 @@ #:prefix gnu:services:certbot:) #:use-module ((gnu services cgit) #:prefix gnu:services:cgit:) - #:use-module ((gnu services dns) - #:prefix gnu:services:dns:) #:use-module ((gnu services mail) #:prefix gnu:services:mail:) #:use-module ((gnu services networking) @@ -93,33 +92,32 @@ (define ttl "3600") -(gnu:services:dns:define-zone-entries - marekpasnikowski.pl-entries - ("@" ttl "IN" "A" ip-otvarta) - ("2" ttl "IN" "A" ip-otvarta) - ("ns1" ttl "IN" "A" ip-otvarta) - ("@" ttl "IN" "NS" "ns1.marekpasnikowski.pl.") - ("@" ttl "IN" "A" ip-multimedia) - ("1" ttl "IN" "A" ip-multimedia) - ("ns2" ttl "IN" "A" ip-multimedia) - ("@" ttl "IN" "NS" "ns2.marekpasnikowski.pl.") - ("@" ttl "IN" "MX" "10 marekpasnikowski.pl.") - ("@" ttl "IN" "TXT" spf-value) - ("_caldavs._tcp" ttl "IN" "SRV" "10 0 443 radicale.marekpasnikowski.pl") - ("_carddavs._tcp" ttl "IN" "SRV" "10 0 443 radicale.marekpasnikowski.pl") - ("_dmarc" ttl "IN" "TXT" "\"v=DMARC1; p=reject; sp=reject; pct=100; aspf=s; adkim=s; fo=1; rua=mailto:abuse@marekpasnikowski.pl; ruf=mailto:abuse@marekpasnikowski.pl\"") - ("dkim._domainkey" ttl "IN" "TXT" "\"v=DKIM1; d=marekpasnikowski.pl; t=s; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo/b/WV5EUxqAhBgJ4v5K3sP8QI+IwziRJ/F9SDO3p3QOMjZd9AGVt2/AztZ4EmcOJnTlbQnLE/DKCOq4HAdxSZjIqj5AXyMddvWiO78+ugdame/flV0tjdDGNflx65Twap3qgJ9jzhvJfZ1BDuh2WC06fn2pyFl1TCETEGp6ZDkI41FW5GH8l9Jk7hhCmr+Mau0EpE7V42lBdireItOA1e7jQcub50584QATme4rYxA7WR4AeIsknOkUo4q8vkVrssoP11nSg/sNM9RGn1QDfVMJRX0twtgGnJ8N5QE4Ia9DvXL4Y0PNMC0/frp13pB6m1VQP/Z4jfDy+TQzEdSRaQIDAQAB\"") - ("git" ttl "IN" "CNAME" "1") - ("guix" ttl "IN" "CNAME" "1") - ("matrix" ttl "IN" "CNAME" "1") - ("radicale" ttl "IN" "CNAME" "1") - ("schron" ttl "IN" "CNAME" "1") - ("sejf" ttl "IN" "CNAME" "1") - ("test" ttl "IN" "CNAME" "1") - ("www" ttl "IN" "CNAME" "1")) +(define-zone-entries marekpasnikowski.pl-entries + ("@" ttl "IN" "A" ip-otvarta) + ("2" ttl "IN" "A" ip-otvarta) + ("ns1" ttl "IN" "A" ip-otvarta) + ("@" ttl "IN" "NS" "ns1.marekpasnikowski.pl.") + ("@" ttl "IN" "A" ip-multimedia) + ("1" ttl "IN" "A" ip-multimedia) + ("ns2" ttl "IN" "A" ip-multimedia) + ("@" ttl "IN" "NS" "ns2.marekpasnikowski.pl.") + ("@" ttl "IN" "MX" "10 marekpasnikowski.pl.") + ("@" ttl "IN" "TXT" spf-value) + ("_caldavs._tcp" ttl "IN" "SRV" "10 0 443 radicale.marekpasnikowski.pl") + ("_carddavs._tcp" ttl "IN" "SRV" "10 0 443 radicale.marekpasnikowski.pl") + ("_dmarc" ttl "IN" "TXT" "\"v=DMARC1; p=reject; sp=reject; pct=100; aspf=s; adkim=s; fo=1; rua=mailto:abuse@marekpasnikowski.pl; ruf=mailto:abuse@marekpasnikowski.pl\"") + ("dkim._domainkey" ttl "IN" "TXT" "\"v=DKIM1; d=marekpasnikowski.pl; t=s; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAo/b/WV5EUxqAhBgJ4v5K3sP8QI+IwziRJ/F9SDO3p3QOMjZd9AGVt2/AztZ4EmcOJnTlbQnLE/DKCOq4HAdxSZjIqj5AXyMddvWiO78+ugdame/flV0tjdDGNflx65Twap3qgJ9jzhvJfZ1BDuh2WC06fn2pyFl1TCETEGp6ZDkI41FW5GH8l9Jk7hhCmr+Mau0EpE7V42lBdireItOA1e7jQcub50584QATme4rYxA7WR4AeIsknOkUo4q8vkVrssoP11nSg/sNM9RGn1QDfVMJRX0twtgGnJ8N5QE4Ia9DvXL4Y0PNMC0/frp13pB6m1VQP/Z4jfDy+TQzEdSRaQIDAQAB\"") + ("git" ttl "IN" "CNAME" "1") + ("guix" ttl "IN" "CNAME" "1") + ("matrix" ttl "IN" "CNAME" "1") + ("radicale" ttl "IN" "CNAME" "1") + ("schron" ttl "IN" "CNAME" "1") + ("sejf" ttl "IN" "CNAME" "1") + ("test" ttl "IN" "CNAME" "1") + ("www" ttl "IN" "CNAME" "1")) (define marekpasnikowski.pl-zone - (gnu:services:dns:zone-file + (zone-file (entries marekpasnikowski.pl-entries) (origin "marekpasnikowski.pl") (ns "ns1.marekpasnikowski.pl.") @@ -127,19 +125,19 @@ (serial 2026042000))) (define master-zone - (gnu:services:dns:knot-zone-configuration + (knot-zone-configuration (domain "marekpasnikowski.pl") (zone marekpasnikowski.pl-zone))) -(define knot-configuration - (gnu:services:dns:knot-configuration +(define aisaka-knot-configuration + (knot-configuration (listen-v4 "0.0.0.0") (zones (list master-zone)))) (define-public knot (gnu:services:service - gnu:services:dns:knot-service-type - knot-configuration)) + knot-service-type + aisaka-knot-configuration)) (define radicale-keys "/secrets/radicale/keys") |