From d20f2f0af750a5f43b5bb7c08c5bfbdde4a3e409 Mon Sep 17 00:00:00 2001
From: Joerg Lehmann <joerg.lehmann@nbit.ch>
Date: Fri, 4 Feb 2022 17:22:45 +0100
Subject: [PATCH] commit as of 04feb2022

---
 managed-keys.bind     |   6 +++---
 managed-keys.bind.jnl | Bin 1856 -> 3872 bytes
 nbit.ch.zone          |  44 ++++++++++++++++++++----------------------
 wo-bisch.ch.zone      |   3 +--
 4 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/managed-keys.bind b/managed-keys.bind
index e3f7f69..2c6129a 100644
--- a/managed-keys.bind
+++ b/managed-keys.bind
@@ -1,13 +1,13 @@
 $ORIGIN .
 $TTL 0	; 0 seconds
 @			IN SOA	. . (
-				63         ; serial
+				262        ; serial
 				0          ; refresh (0 seconds)
 				0          ; retry (0 seconds)
 				0          ; expire (0 seconds)
 				0          ; minimum (0 seconds)
 				)
-			KEYDATA	20210915190751 20210816173915 19700101000000 257 3 8 (
+			KEYDATA	20220204164619 20210816173915 19700101000000 257 3 8 (
 				AwEAAaz/tAm8yTn4Mfeh5eyI96WSVexTBAvkMgJzkKTO
 				iW1vkIbzxeF3+/4RgWOq7HrxRixHlFlExOLAJr5emLvN
 				7SWXgnLh4+B5xQlNVz8Og8kvArMtNROxVQuCaSnIDdD5
@@ -17,5 +17,5 @@ $TTL 0	; 0 seconds
 				A4/ilBmSVIzuDWfdRUfhHdY6+cn8HFRm+2hM8AnXGXws
 				9555KrUB5qihylGa8subX2Nn6UwNR1AkUTV74bU=
 				) ; KSK; alg = RSASHA256; key id = 20326
-				; next refresh: Wed, 15 Sep 2021 19:07:51 GMT
+				; next refresh: Fri, 04 Feb 2022 16:46:19 GMT
 				; trusted since: Mon, 16 Aug 2021 17:39:15 GMT
diff --git a/managed-keys.bind.jnl b/managed-keys.bind.jnl
index 7d6950be25cd145ddd9d7b4b6ca2e90248d936e0..218ebc0362127b1de4f038bfd8a582a8f42bc98f 100644
GIT binary patch
delta 396
zcmX@Ww?Iz8+R4+;MZw44T_Ma;&xnhGfq{{cfq@A`voSF6D@;^SQiF>Cg;^E=WtbTl
z*d2g03j+h^10c=Hz`)b6F>n^6GSdX0PM|PI3nR!BMFs{o1|SCr#6Sci<K$ds1?F!D
zZf~BzEW|iDidm3}kqIpJLns<3CdDWX(g?BxQ!}zcm}X|M=AX$R13{XB8bJ=j)QqeU
zrkMq-`PWvM%^;@(eS@hPSs_d_D_HX%Hki#oji5lo)QqeUrkM?_`ELZsW&uV3<k>!j

delta 192
zcmZ1=cYsg9+R4+;MZw44T_Ma;&xnfw2y7V`m_W2W0|UFmL<J>2xQHDC1IvPqg%cSk
zHYh4HO#rH4fv9Hy$}lK0Ft9N&0vQYpVqnsCaxSw1v%_ch%@de~7$-+D3o<d-fyJE6
ep8>_B7^T4)ffiwEMpg*ZY!A`w(hk%tzz6^-t{)lz

diff --git a/nbit.ch.zone b/nbit.ch.zone
index a2b3ece..fbf60ac 100644
--- a/nbit.ch.zone
+++ b/nbit.ch.zone
@@ -2,7 +2,7 @@ $TTL 4h
 $ORIGIN nbit.ch.
 
 @  1D  IN	 SOA ns1.nbit.ch. hostmaster.nbit.ch. (
-			      2021081602 ; serial
+			      2021092702 ; serial
 			      3H ; refresh
 			      120; retry
 			      2w ; expire
@@ -16,28 +16,26 @@ $ORIGIN nbit.ch.
        IN  TXT "v=spf1 a:mail.nbit.ch mx ?all"
 
 ; server host definitions
-        IN      A       23.88.33.113
-        IN      AAAA    2a01:4f8:c010:90e1::1
-ns1     IN      A       94.130.184.127
-ns1     IN      AAAA    2a01:4f8:c2c:12ed::1
-ns2     IN      A       95.216.148.212
-ns2     IN      AAAA    2a01:4f9:c010:5dd::1
-mail    IN      A       135.181.95.247
-mail    IN      AAAA    2a01:4f9:c010:d05a::1
-www     IN      A       23.88.33.113
-www     IN      AAAA    2a01:4f8:c010:90e1::1
-zabbix  IN      A       195.201.222.24
-wiki    IN      A       23.88.33.113
-wiki    IN      AAAA    2a01:4f8:c010:90e1::1
-ftppwd  IN      A       195.201.222.24
-pepper  IN      A       195.201.222.24
-pepper  IN      AAAA    2a01:4f8:1c1c:2622::1
-humpty  IN      A       94.130.184.127
-humpty  IN      AAAA    2a01:4f8:c2c:12ed::1
-dumpty  IN      A       95.216.148.212
-dumpty  IN      AAAA    2a01:4f9:c010:5dd::1
-moby    IN      A       23.88.33.113
-moby    IN      AAAA    2a01:4f8:c010:90e1::1
+              IN      A       23.88.33.113
+              IN      AAAA    2a01:4f8:c010:90e1::1
+ns1           IN      A       94.130.184.127
+ns1           IN      AAAA    2a01:4f8:c2c:12ed::1
+ns2           IN      A       95.216.148.212
+ns2           IN      AAAA    2a01:4f9:c010:5dd::1
+autodiscover  IN      CNAME   mail.nbit.ch.
+autoconfig    IN      CNAME   mail.nbit.ch.
+mail          IN      A       135.181.95.247
+mail          IN      AAAA    2a01:4f9:c010:d05a::1
+www           IN      A       23.88.33.113
+www           IN      AAAA    2a01:4f8:c010:90e1::1
+wiki          IN      A       23.88.33.113
+wiki          IN      AAAA    2a01:4f8:c010:90e1::1
+humpty        IN      A       94.130.184.127
+humpty        IN      AAAA    2a01:4f8:c2c:12ed::1
+dumpty        IN      A       95.216.148.212
+dumpty        IN      AAAA    2a01:4f9:c010:5dd::1
+moby          IN      A       23.88.33.113
+moby          IN      AAAA    2a01:4f8:c010:90e1::1
 
 dkim._domainkey     IN TXT "v=DKIM1;k=rsa;t=s;s=email;p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCqsUToA7e5oYy+5eREY15imqyKTdVo3t5o5dYdMuOFp8pofmoaSsSmJTEuhapU8zo2Dw7XjGwhvbD5qLzHEX0LE9tiSiKRbvSvTTQgfcTdngE+i6eA9A2g3INkv9YwSlga+kCddxsDKSCT5XpeTqweLiT0+TEL7RCtFM1FOnAZcwIDAQAB"
 
diff --git a/wo-bisch.ch.zone b/wo-bisch.ch.zone
index 3cad8ea..aca53d3 100644
--- a/wo-bisch.ch.zone
+++ b/wo-bisch.ch.zone
@@ -2,7 +2,7 @@ $TTL 4h
 $ORIGIN wo-bisch.ch.
 
 @  1D  IN	 SOA ns1.nbit.ch. hostmaster.nbit.ch. (
-			      2021091501 ; serial
+			      2021092701 ; serial
 			      3H ; refresh
 			      120; retry
 			      2w ; expire
@@ -14,7 +14,6 @@ $ORIGIN wo-bisch.ch.
        IN  MX  10 mail.nbit.ch.  ; Mail Exchange
 
        IN  TXT "v=spf1 mx -all"
-       IN  SPF "v=spf1 mx -all"
 
        IN  TXT "google-site-verification=QetTfKzF08piZ9jYSUcTsnRKO8vyCaUrEafNq4rcqZM"