diff options
| author | Wojtek Kosior <koszko@koszko.org> | 2023-11-08 13:18:25 +0100 |
|---|---|---|
| committer | Wojtek Kosior <koszko@koszko.org> | 2023-11-08 13:38:53 +0100 |
| commit | 2a2cc8804a495269a20a7802e63a9fcf2463733c (patch) | |
| tree | 8919b76cb8c6aeaee26a86c465b3f7b896c70374 | |
| parent | 1a5bb0bbce4fe79c9c346d5e8e42172d3ee14f86 (diff) | |
| download | koszko-org-server-2a2cc8804a495269a20a7802e63a9fcf2463733c.tar.gz koszko-org-server-2a2cc8804a495269a20a7802e63a9fcf2463733c.zip | |
Provisionally include git.happyhacking.pl in DNS and httpd
| -rw-r--r-- | container.scm | 53 | ||||
| -rw-r--r-- | exim.conf | 2 |
2 files changed, 52 insertions, 3 deletions
diff --git a/container.scm b/container.scm index 74c7b74..6e664a8 100644 --- a/container.scm +++ b/container.scm @@ -208,7 +208,8 @@ (add-site-conf (koszko-httpd-site-conf - (name-and-aliases '("git.koszko.org" "git.koszkonutek-tmp.pl.eu.org")) + (name-and-aliases '("git.koszko.org" "git.koszkonutek-tmp.pl.eu.org" + "git.happyhacking.pl")) (body `(;; Hachette got renamed to "Haketilo", repo moved ,(httpd-directive @@ -855,6 +856,53 @@ exim_path = /run/setuid-programs/exim (semantic-checks? #t) (notify '("1984-axfr-remote")))) +(define %happyhacking-pl-provisional-zone-entries + (let () + (define-zone-entries entries + ;; nameservers + ("@" "" "IN" "NS" "vps-93-95-227-159.1984.is.") + ("@" "" "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 + ("git" "" "IN" "CNAME" "git.koszko.org.") + ;; mail + ("@" "" "IN" "MX 10" "koszko.org.") + ;; dmarc + ("@" "" "IN" "TXT" "\"v=spf1 ip4:93.95.227.159 -all\"") + ("_dmarc" "" "IN" "TXT" "\"v=DMARC1;p=reject;rua=mailto:dmarc@koszko.org;ruf=mailto:dmarc@koszko.org;rf=afrf;pct=100\"") + ("mail._domainkey" "" "IN" "TXT" "( + \"k=rsa;t=s;p=MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAx0kXNRIL\" + \"VRDaU1iPdUu2FwX+pRbNS4DwojiOYznESt1npY8LzYV3MBKf2XXOSl+6Ui8Jy91V\" + \"KzoUqwN9Rh6vdsLYPaMMtPUe/gN1AOqyF4qYqz499VZqRLmoPyq4EV5eRSqbDeDb\" + \"eDOaoJ0+ZJHG6qg2eAz1v2U++lsSRTOkXe3xZFxrHRrvXg5JVl5DNGRKBjotwW8O\" + \"EMhwUa2LbmJA/EbbCWhXfmaIEwqP2LRUF2HqFMSr4IHHopcTKQwpSwbsOGYG8MV1\" + \"c5HelO+OROpuUNPE8YoKVHKwfWdwgStrrkSYK+H5JQvJgFvyfsyePfXfqszde+4B\" + \"EC34ScPW86HKmw4JltFpBCiBThYdD0fu8g5mQzdtwNUbCcPkuUDrUTA4TE44ScHO\" + \"VYDX0QWaUubrsf5F1+bwyTKuzbUHXnbXw7r7JLC2P4CjtsS4MLYjrfeQ3TIEdj+s\" + \"WtWVItIVQnFRuSTFmHKqnWNDSjmTeH5m8FWPQeDjXRj2e1f5vCrfIvyXTzWvOeIw\" + \"DU2QfyUPUKaL9hvNvX9S3G45qM/CH5UTRc2BC0dFZHBNR/uLTGMYaatfw2QAxQzs\" + \"cmw34IgwLGswxFj3iaDwc8d3Uh+JamFBf+GUrwjRs/sVRRiXrB+qKwlxckzWHVbV\" + \"oABCxjKDmvE86L3kCQ+MobG0BOtFBR4BqU8CAwEAAQ==\" +)") + ("happyhacking.pl._report._dmarc" "" "IN" "TXT" "\"v=DMARC1\"")) + entries)) + +(define %happyhacking-pl-zone-configuration + (knot-zone-configuration + (domain "happyhacking.pl") + (zone (zone-file + (origin "happyhacking.pl") + (entries %happyhacking-pl-provisional-zone-entries) + (ns "vps-93-95-227-159.1984.is.") + (mail "root") + (serial 2023110800))) + (acl '("allow-axfr-from-1984")) + (semantic-checks? #t) + (notify '("1984-axfr-remote")))) + (define knot-configuration-knot (@@ (gnu services dns) knot-configuration-knot)) @@ -911,7 +959,8 @@ log: (id "1984-axfr-remote") (address '("93.95.224.6"))))) (zones (list %koszko-org-zone-configuration - %koszkonutek-tmp.pl.eu.org-zone-configuration))))) + %koszkonutek-tmp.pl.eu.org-zone-configuration + %happyhacking-pl-zone-configuration))))) (operating-system (host-name "koszko") @@ -12,7 +12,7 @@ log_file_path = $spool_directory/log/%slog log_selector = +smtp_protocol_error +smtp_syntax_error \ +tls_certificate_verified +tls_peerdn -domainlist local_domains = @:localhost:koszko.org:koszkonutek-tmp.pl.eu.org +domainlist local_domains = @:localhost:koszko.org:koszkonutek-tmp.pl.eu.org:happyhacking.pl domainlist relay_to_domains = hostlist relay_from_hosts = : 127.0.0.1 : ::::1 |