Fix RFC2136 TSIG: regression related to multiplexer

tests/docker/docker-compose.yml

@@ -241,8 +241,7 @@ services:
     volumes:
       - ./powerdns/pdns.conf:/etc/powerdns/pdns.d/stalwart.conf:ro
       - ./powerdns/init-zone.sh:/etc/powerdns/init-zone.sh:ro
-    tmpfs:
-      - /var/lib/powerdns
+      - pdns-data:/var/lib/powerdns
 
   powerdns-init:
     image: powerdns/pdns-auth-49:latest
@@ -251,6 +250,7 @@ services:
     volumes:
       - ./powerdns/entrypoint.sh:/init.sh:ro
       - ./powerdns/init-zone.sh:/etc/powerdns/init-zone.sh:ro
+      - pdns-data:/var/lib/powerdns
     entrypoint: [ "bash", "/init.sh" ]
     network_mode: "service:powerdns"
 
@@ -272,3 +272,5 @@ volumes:
     driver: local
   fdb-config:
     driver: local
+  pdns-data:
+    driver: local

tests/docker/powerdns/init-zone.sh

@@ -4,13 +4,20 @@ set -e
 # Wait for the SQLite database to be ready
 sleep 2
 
-# Create the zone
+# Skip if already initialized
+if pdnsutil list-zone stalwart.test >/dev/null 2>&1; then
+    echo "Zone stalwart.test already exists; skipping init."
+    exit 0
+fi
+
+# Create the zone with default SOA + NS
 pdnsutil create-zone stalwart.test ns1.stalwart.test
 pdnsutil set-kind stalwart.test native
 
+# Replace the default SOA with our own
+pdnsutil replace-rrset stalwart.test '' SOA 'ns1.stalwart.test. admin.stalwart.test. 2024010101 3600 900 604800 86400'
+
 # Add basic records
-pdnsutil add-record stalwart.test '' SOA 'ns1.stalwart.test. admin.stalwart.test. 2024010101 3600 900 604800 86400'
-pdnsutil add-record stalwart.test '' NS 'ns1.stalwart.test.'
 pdnsutil add-record stalwart.test 'ns1' A '127.0.0.1'
 pdnsutil add-record stalwart.test '' A '127.0.0.1'
 pdnsutil add-record stalwart.test '' MX '10 mail.stalwart.test.'
@@ -24,10 +31,11 @@ pdnsutil add-record stalwart.test '_25._tcp.mail' TLSA '3 1 1 000000000000000000
 # Key: stalwart-update-key / HMAC-SHA256
 # Base64 secret: c3RhbHdhcnQtdGVzdC10c2lnLXNlY3JldC1rZXkxMjM0NTY3ODkw
 pdnsutil import-tsig-key stalwart-update-key hmac-sha256 'c3RhbHdhcnQtdGVzdC10c2lnLXNlY3JldC1rZXkxMjM0NTY3ODkw'
-pdnsutil activate-tsig-key stalwart.test stalwart-update-key master
+pdnsutil activate-tsig-key stalwart.test stalwart-update-key primary
 pdnsutil set-meta stalwart.test TSIG-ALLOW-DNSUPDATE stalwart-update-key
 pdnsutil set-meta stalwart.test ALLOW-DNSUPDATE-FROM '0.0.0.0/0'
 
+
 echo "PowerDNS zone setup complete."
 echo "TSIG key name:      stalwart-update-key"
 echo "TSIG algorithm:     hmac-sha256"

tests/docker/powerdns/pdns.conf

@@ -1,2 +1,3 @@
 dnsupdate=yes
 allow-dnsupdate-from=0.0.0.0/0
+zone-cache-refresh-interval=0