SOA parameters for pdns 4.4 (#32)

* SOA parameters for pdns 4.4

* Re-order Serial ID before Refresh

---------

Co-authored-by: Jonathan <[email protected]>

Author: eburcat

README.md

@@ -30,6 +30,14 @@ environment variables override those:
 
 `NIPIO_SOA_NS`: SOA name server.
 
+`NIPIO_SOA_REFRESH`: SOA refresh.
+
+`NIPIO_SOA_RETRY`: SOA retry.
+
+`NIPIO_SOA_EXPIRY`: SOA expiry.
+
+`NIPIO_SOA_MINIMUM_TTL`: SOA minimum time-to-live (TTL).
+
 `NIPIO_NAMESERVERS`: A space-separated list of domain=ip nameserver pairs. Example: `ns1.nip.io=127.0.0.1 ns2.nip.io=127.0.0.1`.
 
 `NIPIO_WHITELIST`: A space-separated list of description=range pairs for whitelisted ranges in CIDR format.

nipio/backend.conf

@@ -23,6 +23,14 @@ id=1
 [email protected]
 # Name server
 ns=ns1.nip.io.example
+# Refresh
+refresh=10800
+# Retry
+retry=3600
+# Expiry
+expiry=604600
+# Minimum TTL
+minimum=3600
 
 
 # nameservers

nipio/backend.py

@@ -121,6 +121,10 @@ class DynamicBackend:
     NIPIO_SOA_ID -- SOA serial number.
     NIPIO_SOA_HOSTMASTER -- SOA hostmaster email address.
     NIPIO_SOA_NS -- SOA name server.
+    NIPIO_SOA_REFRESH -- SOA refresh.
+    NIPIO_SOA_RETRY -- SOA retry.
+    NIPIO_SOA_EXPIRY -- SOA expiry.
+    NIPIO_SOA_MINIMUM_TTL -- SOA minimum time-to-live (TTL).
     NIPIO_NAMESERVERS -- A space-separated list of domain=ip nameserver pairs.
     NIPIO_WHITELIST -- A space-separated list of description=range pairs to whitelist.
                        The range should be in CIDR format.
@@ -163,10 +167,14 @@ def configure(self, config_filename: str = _get_default_config_file()) -> None:
             config.read_file(fp)
 
         self.id = os.getenv("NIPIO_SOA_ID", config.get("soa", "id"))
-        self.soa = "%s %s %s" % (
+        self.soa = "%s %s %s %s %s %s %s" % (
             _resolve_configuration("NIPIO_SOA_NS", config, "soa", "ns"),
             _resolve_configuration("NIPIO_SOA_HOSTMASTER", config, "soa", "hostmaster"),
             self.id,
+            _resolve_configuration("NIPIO_SOA_REFRESH", config, "soa", "refresh"),
+            _resolve_configuration("NIPIO_SOA_RETRY", config, "soa", "retry"),
+            _resolve_configuration("NIPIO_SOA_EXPIRY", config, "soa", "expiry"),
+            _resolve_configuration("NIPIO_SOA_MINIMUM_TTL", config, "soa", "minimum"),
         )
         self.domain = os.getenv("NIPIO_DOMAIN", config.get("main", "domain"))
         self.ip_address = os.getenv(

nipio_tests/backend_test.conf

@@ -23,7 +23,14 @@ id=55
 [email protected]
 # Name server
 ns=ns1.nip.io.test
-
+# Refresh
+refresh=56
+# Retry
+retry=57
+# Expiry
+expiry=58
+# Minimum TTL
+minimum=59
 
 # nameservers
 [nameservers]

nipio_tests/backend_test.py

@@ -767,7 +767,7 @@ def test_configure_with_full_config(self) -> None:
         )
         assert_that(backend.blacklisted_ips).is_equal_to(["10.0.0.100"])
         assert_that(backend.soa).is_equal_to(
-            "ns1.nip.io.test [email protected] 55"
+            "ns1.nip.io.test [email protected] 55 56 57 58 59"
         )
 
     def test_configure_with_environment_variables_set(self) -> None:
@@ -777,6 +777,10 @@ def test_configure_with_environment_variables_set(self) -> None:
         os.environ["NIPIO_SOA_ID"] = "99"
         os.environ["NIPIO_SOA_HOSTMASTER"] = "[email protected]"
         os.environ["NIPIO_SOA_NS"] = "ns1.example.com"
+        os.environ["NIPIO_SOA_REFRESH"] = "40"
+        os.environ["NIPIO_SOA_RETRY"] = "41"
+        os.environ["NIPIO_SOA_EXPIRY"] = "42"
+        os.environ["NIPIO_SOA_MINIMUM_TTL"] = "43"
         os.environ[
             "NIPIO_NAMESERVERS"
         ] = "ns1.example.com=127.0.0.31 ns2.example.com=127.0.0.32"
@@ -800,7 +804,7 @@ def test_configure_with_environment_variables_set(self) -> None:
         )
         assert_that(backend.blacklisted_ips).is_equal_to(["10.0.0.111", "10.0.0.112"])
         assert_that(backend.soa).is_equal_to(
-            "ns1.example.com [email protected] 99"
+            "ns1.example.com [email protected] 99 40 41 42 43"
         )
 
     def test_configure_with_env_lists_config(self) -> None:

nipio_tests/backend_test_no_lists.conf

@@ -23,6 +23,14 @@ id=55
 [email protected]
 # Name server
 ns=ns1.nip.io.test
+# Refresh
+refresh=56
+# Retry
+retry=57
+# Expiry
+expiry=58
+# Minimum TTL
+minimum=59
 
 
 # nameservers

pdns/pdns.conf

@@ -245,26 +245,6 @@ setuid=pdns
 #
 # smtpredirector=a.misconfigured.powerdns.smtp.server
 
-#################################
-# soa-expire-default	Default SOA expire
-#
-# soa-expire-default=604800
-
-#################################
-# soa-minimum-ttl	Default SOA mininum ttl
-#
-# soa-minimum-ttl=3600
-
-#################################
-# soa-refresh-default	Default SOA refresh
-#
-# soa-refresh-default=10800
-
-#################################
-# soa-retry-default	Default SOA retry
-#
-# soa-retry-default=3600
-
 #################################
 # soa-serial-offset	Make sure that no SOA serial is less than this number
 #