v2: finish to remove the CheckChallengeDelay and set to correct type default values

acme_dns_tiny.py

@@ -284,16 +284,15 @@ See example.ini file to configure correctly this script."""
     args = parser.parse_args(argv)
 
     config = ConfigParser()
-    config.read_dict({"acmednstiny": {"ACMEDirectory": "https://acme-staging-v02.api.letsencrypt.org/directory",
-                                      "CheckChallengeDelay": 3},
-                      "DNS": {"Port": "53",
-                              "TTL": "10"}})
+    config.read_dict({"acmednstiny": {"ACMEDirectory": "https://acme-staging-v02.api.letsencrypt.org/directory"},
+                      "DNS": {"Port": 53,
+                              "TTL": 10}})
     config.read(args.configfile)
 
     if args.csr :
         config.set("acmednstiny", "csrfile", args.csr)
 
-    if (set(["accountkeyfile", "csrfile", "acmedirectory", "checkchallengedelay"]) - set(config.options("acmednstiny"))
+    if (set(["accountkeyfile", "csrfile", "acmedirectory"]) - set(config.options("acmednstiny"))
         or set(["keyname", "keyvalue", "algorithm"]) - set(config.options("TSIGKeyring"))
         or set(["zone", "host", "port", "ttl"]) - set(config.options("DNS"))):
         raise ValueError("Some required settings are missing.")

tests/config_factory.py

@@ -5,11 +5,11 @@ from subprocess import Popen
 # domain with server.py running on it for testing
 DOMAIN = os.getenv("GITLABCI_DOMAIN")
 ACMEDIRECTORY = os.getenv("GITLABCI_ACMEDIRECTORY_V2", "https://acme-staging-v02.api.letsencrypt.org/directory")
-CHALLENGEDELAY = os.getenv("GITLABCI_CHALLENGEDELAY", "3")
 DNSHOST = os.getenv("GITLABCI_DNSHOST")
 DNSHOSTIP = os.getenv("GITLABCI_DNSHOSTIP")
 DNSZONE = os.getenv("GITLABCI_DNSZONE")
 DNSPORT = os.getenv("GITLABCI_DNSPORT", "53")
+DNSTTL = os.getenv("GITLABCI_DNSTTL", "10")
 TSIGKEYNAME = os.getenv("GITLABCI_TSIGKEYNAME")
 TSIGKEYVALUE = os.getenv("GITLABCI_TSIGKEYVALUE")
 TSIGALGORITHM = os.getenv("GITLABCI_TSIGALGORITHM")
@@ -32,7 +32,6 @@ def generate_config():
     parser["acmednstiny"]["AccountKeyFile"] = account_key.name
     parser["acmednstiny"]["CSRFile"] = domain_csr.name
     parser["acmednstiny"]["ACMEDirectory"] = ACMEDIRECTORY
-    parser["acmednstiny"]["CheckChallengeDelay"] = CHALLENGEDELAY
     parser["acmednstiny"]["Contacts"] = "mailto:mail@example.com"
     parser["TSIGKeyring"]["KeyName"] = TSIGKEYNAME
     parser["TSIGKeyring"]["KeyValue"] = TSIGKEYVALUE
@@ -40,6 +39,7 @@ def generate_config():
     parser["DNS"]["Host"] = DNSHOST
     parser["DNS"]["Port"] = DNSPORT
     parser["DNS"]["Zone"] = DNSZONE
+    parser["DNS"]["TTL"] = DNSTTL
 
     config = NamedTemporaryFile(delete=False)
     with open(config.name, 'w') as configfile: