diff options
Diffstat (limited to 'salamina.scm')
| -rw-r--r-- | salamina.scm | 79 |
1 files changed, 11 insertions, 68 deletions
diff --git a/salamina.scm b/salamina.scm index 45e3a13..54da3ee 100644 --- a/salamina.scm +++ b/salamina.scm @@ -134,8 +134,7 @@ '(("koszko.org" "www.koszko.org" "koszkonutek-tmp.pl.eu.org" "www.koszkonutek-tmp.pl.eu.org") ("git.koszko.org" "www.git.koszko.org" - "git.koszkonutek-tmp.pl.eu.org" "www.git.koszkonutek-tmp.pl.eu.org" - "git.happyhacking.pl" "www.git.happyhacking.pl") + "git.koszkonutek-tmp.pl.eu.org" "www.git.koszkonutek-tmp.pl.eu.org") ("haketilo.koszko.org" "www.haketilo.koszko.org") ("hydrilla.koszko.org") ("hydrillabugs.koszko.org" "www.hydrillabugs.koszko.org" @@ -206,8 +205,6 @@ ServerAlias www.git.koszko.org ServerAlias git.koszkonutek-tmp.pl.eu.org ServerAlias www.git.koszkonutek-tmp.pl.eu.org - ServerAlias git.happyhacking.pl - ServerAlias www.git.happyhacking.pl ServerAdmin webmaster@koszko.org <If \"%{HTTP_HOST} != 'git.koszko.org'\"> @@ -473,8 +470,7 @@ . #f) (("git.koszko.org" "www.git.koszko.org" "git.koszkonutek-tmp.pl.eu.org" - "www.git.koszkonutek-tmp.pl.eu.org" - "git.happyhacking.pl" "www.git.happyhacking.pl") . #f) + "www.git.koszkonutek-tmp.pl.eu.org") . #f) (("haketilo.koszko.org" "www.haketilo.koszko.org") . #f) (("hydrilla.koszko.org") . #f) (("hydrillabugs.koszko.org" "www.hydrillabugs.koszko.org" @@ -560,47 +556,6 @@ entries) -(dns:define-zone-entries %happyhacking.pl-zone-entries - ;; nameservers - ("@" "" "IN" "NS" "ns2.happyhacking.pl.") - ("@" "" "IN" "NS" "ns0.1984.is.") - ("@" "" "IN" "NS" "ns1.1984.is.") - ("@" "" "IN" "NS" "ns2.1984.is.") - ("@" "" "IN" "NS" "ns1.1984hosting.com.") - ("@" "" "IN" "NS" "ns2.1984hosting.com.") - ;; domain->IP assignments - ("ns1" "" "IN" "A" "188.68.236.76") - ("ns2" "" "IN" "A" "188.68.237.248") - ("@" "" "IN" "CNAME" "salamina.koszko.org") - ("www" "" "IN" "CNAME" "@") - ("git" "" "IN" "CNAME" "@") - ("www.git" "" "IN" "CNAME" "git") - ;; mail - ("@" "" "IN" "MX 10" "smtp.koszko.org.") - ("@" "" "IN" "TXT" "\"v=spf1 ip4:188.68.236.76 ip4:188.68.237.248 -all\"") - ("_dmarc" "" "IN" "TXT" (format #f "\"~{~{~a=~a~}~^;~}\"" - '(("v" "DMARC1") - ("p" "reject") - ("rua" "mailto:dmarc@happyhacking.pl") - ("ruf" "mailto:dmarc@happyhacking.pl") - ("rf" "afrf") - ("pct" "100")))) - ("happyhacking.pl._report._dmarc" "" "IN" "TXT" "\"v=DMARC1\"") - ("mail-salamina._domainkey" "" "IN" "TXT" "( - \"k=rsa;t=s;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsC9HfcId\" - \"QGcBzYtBzv/VF7vPrRAASwfeAJ3pr0tddpYtFMGGm8kWPAKykX2LvP4epQPdzGL9\" - \"W9qLJk3R+iJSlUYLgP1s4Tr5qiUm/PEHPnjzwC8kqtJ/CrQs7WLfiuE3SElWI3iQ\" - \"FMRCD1Kk07axSOCgLbshthEAxZQqScYiZT7Irl4SHm9SpTUJkqh5xcCTqsW1yuG/\" - \"YWbfERH4PFp2pA85ZZvVEHqd+e8LMLh9EKMYRbhp9AVKMaESIegkO0RZv0KGp4aU\" - \"vzquG1FYQ9VOJ6KiviZANuEL4cpNrqmFb4Wbuwc6w7drWaHjFT/j1mS/eB0DN3el\" - \"nPQnWMTJZPhqnFZKzG37P5VkIDjbcotevsBGV28gx3VJNf1ye1x/P9f4fJw2s7EY\" - \"izNZx9/xfmAiOpP3KhrpE+cccBWnMHYyp0X7ClgBIQTDiLOBX3KhH+GOuADMcum1\" - \"4y8SHw2xSYGGk46YI0fBf8kaJsAA9wBQvuBFSj1MjxjdWt0GF0OLnGB1RsPZx+nU\" - \"Q+EZz0PDuv16ofN7MaOfY+kD6XoBCDjj4FDqLOgBgoLS7LfLyYTElbuItj12Yqph\" - \"ZPY4I+Lmn9nzl3tEnUqtRNu5LPhIR9mj/4BLp2UPgkVnqTAcA+qxoJghm8hh9AS9\" - \"2pelav0CarwwvUo09rcvujksuwy8TulK8ckCAwEAAQ==\" - )")) - (prepend %services (service dns:knot-service-type (dns:knot-configuration @@ -613,31 +568,19 @@ (id "1984-axfr-remote") (address '("93.95.224.6"))))) - (zones (cons* (dns:knot-zone-configuration - (domain "happyhacking.pl") + (zones (map (lambda (domain) + (dns:knot-zone-configuration + (domain domain) (zone (dns:zone-file - (origin "happyhacking.pl") - (entries %happyhacking.pl-zone-entries) + (origin domain) + (entries (make-koszko-zone-entries domain)) (ns "ns2") - (mail "hostmaster") - (serial 2024050300))) + (mail "koszko") + (serial 2024070301))) (acl '("allow-axfr-from-1984")) (semantic-checks? #t) - (notify '("1984-axfr-remote"))) - - (map (lambda (domain) - (dns:knot-zone-configuration - (domain domain) - (zone (dns:zone-file - (origin domain) - (entries (make-koszko-zone-entries domain)) - (ns "ns2") - (mail "koszko") - (serial 2024070301))) - (acl '("allow-axfr-from-1984")) - (semantic-checks? #t) - (notify '("1984-axfr-remote")))) - '("koszko.org" "koszkonutek-tmp.pl.eu.org"))))))) + (notify '("1984-axfr-remote")))) + '("koszko.org" "koszkonutek-tmp.pl.eu.org")))))) (prepend %services |