diff options
Diffstat (limited to 'deployment')
| -rw-r--r-- | deployment/systems/aisaka.scm | 58 | ||||
| -rw-r--r-- | deployment/systems/akashi.scm | 2 |
2 files changed, 34 insertions, 26 deletions
diff --git a/deployment/systems/aisaka.scm b/deployment/systems/aisaka.scm index 4a04975..a0a2766 100644 --- a/deployment/systems/aisaka.scm +++ b/deployment/systems/aisaka.scm @@ -81,29 +81,27 @@ (gnu:services:dns:define-zone-entries marekpasnikowski.pl-entries - ("@" ttl "IN" "A" ip-multimedia) - ("mx" ttl "IN" "A" ip-otvarta) - ("ns1" ttl "IN" "A" ip-otvarta) - ("@" ttl "IN" "NS" "ns1.marekpasnikowski.pl.") - ("ns2" ttl "IN" "A" ip-multimedia) - ("@" ttl "IN" "NS" "ns2.marekpasnikowski.pl.") - ("mx" ttl "IN" "A" ip-otvarta) - ("@" ttl "IN" "MX" "10 mx1.forwardemail.net.") - ("@" ttl "IN" "MX" "10 mx2.forwardemail.net.") - ;("@" ttl "IN" "MX" "20 mx.marekpasnikowski.pl.") - ("@" ttl "IN" "TXT" "\"forward-email-port=49152\"") - ("@" ttl "IN" "TXT" "\"forward-email=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" "A" ip-multimedia) - ("radicale" ttl "IN" "A" ip-multimedia) - ("schron" ttl "IN" "A" ip-multimedia) - ("sejf" ttl "IN" "A" ip-multimedia) - ("test" ttl "IN" "A" ip-multimedia) - ("www" ttl "IN" "A" ip-multimedia)) + ("@" ttl "IN" "A" ip-otvarta) + ("ns1" ttl "IN" "A" ip-otvarta) + ("@" ttl "IN" "NS" "ns1.marekpasnikowski.pl.") + ("@" ttl "IN" "A" ip-multimedia) + ("www" ttl "IN" "A" ip-multimedia) + ("ns2" ttl "IN" "A" ip-multimedia) + ("@" ttl "IN" "NS" "ns2.marekpasnikowski.pl.") + ("@" ttl "IN" "MX" "10 mx1.forwardemail.net.") + ("@" ttl "IN" "MX" "10 mx2.forwardemail.net.") + ("@" ttl "IN" "TXT" "\"forward-email-port=49152\"") + ("@" ttl "IN" "TXT" "\"forward-email=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" "www") + ("radicale" ttl "IN" "CNAME" "www") + ("schron" ttl "IN" "CNAME" "www") + ("sejf" ttl "IN" "CNAME" "www") + ("test" ttl "IN" "CNAME" "www")) (define marekpasnikowski.pl-zone (gnu:services:dns:zone-file @@ -111,7 +109,7 @@ (origin "marekpasnikowski.pl") (ns "ns1.marekpasnikowski.pl.") (mail "marek.marekpasnikowski.pl.") - (serial 2026031600))) + (serial 2026031601))) (define master-zone (gnu:services:dns:knot-zone-configuration @@ -120,7 +118,7 @@ (define knot-configuration (gnu:services:dns:knot-configuration - (listen-v4 "192.168.1.2") + (listen-v4 "0.0.0.0") (zones (list master-zone)))) (define knot @@ -680,6 +678,16 @@ static-networking iproute2-networking %sovereign-services*)) + (essential-services (gnu:services:modify-services + (gnu:system:operating-system-default-essential-services gnu:system:this-operating-system) + (gnu:services:base:hosts-service-type config + => + (list + (gnu:services:base:host "127.0.0.1" + "marekpasnikowski.pl" + (list "localhost")) + (gnu:services:base:host "::1" + "localhost"))))) (sudoers-file sovereign:systems:%sovereign-sudoers-specification)))) (define-public operating-system* system) diff --git a/deployment/systems/akashi.scm b/deployment/systems/akashi.scm index 896f2f6..aa09381 100644 --- a/deployment/systems/akashi.scm +++ b/deployment/systems/akashi.scm @@ -35,7 +35,7 @@ (define offload-hub #~(build-machine - (name "marekpasnikowski.pl") + (name "www.marekpasnikowski.pl") (systems (list "x86_64-linux" "i686-linux")) (user "marek") |