all: update the configurations and expired certificates

Remove empty options in configurations to minimize confusion and
comment options that have default values.

3 files changed, 32 insertions, 60 deletions

diff --git a/cmd/rescached/rescached.cfg b/cmd/rescached/rescached.cfg
index 95b3de5..5f9aa5e 100644
--- a/cmd/rescached/rescached.cfg
+++ b/cmd/rescached/rescached.cfg
@@ -27,19 +27,12 @@ listen = 127.0.0.1:53
 #listen = 0.0.0.0:53
 
 #http.port = 443
-http.port = 0
+#tls.port = 853
 
-#tls.port  = 853
-tls.port  = 0
+#tls.certificate = /etc/rescached/localhost.cert.pem
+#tls.private_key = /etc/rescached/localhost.key.pem
+#tls.allow_insecure = true
+#doh.behind_proxy = false
 
-#tls.certificate  = /etc/rescached/localhost.cert.pem
-tls.certificate  =
-
-#tls.private_key  = /etc/rescached/localhost.key.pem
-tls.private_key  =
-
-tls.allow_insecure = true
-doh.behind_proxy   = false
-
-cache.prune_delay = 1h0m0s
-cache.prune_threshold = -1h0m0s
+#cache.prune_delay = 1h0m0s
+#cache.prune_threshold = -1h0m0s
diff --git a/cmd/rescached/rescached.cfg.test b/cmd/rescached/rescached.cfg.test
index d3efc95..5a03d6d 100644
--- a/cmd/rescached/rescached.cfg.test
+++ b/cmd/rescached/rescached.cfg.test
@@ -27,19 +27,11 @@ listen = 127.0.0.1:5350
 #listen = 0.0.0.0:53
 
 #http.port = 443
-http.port = 0
-
-#tls.port  = 853
-tls.port  = 0
-
-#tls.certificate  = /etc/rescached/localhost.cert.pem
-tls.certificate  =
-
-#tls.private_key  = /etc/rescached/localhost.key.pem
-tls.private_key  =
-
+#tls.port = 853
+#tls.certificate = /etc/rescached/localhost.cert.pem
+#tls.private_key = /etc/rescached/localhost.key.pem
 tls.allow_insecure = true
-doh.behind_proxy   = false
+#doh.behind_proxy = false
 
-cache.prune_delay = 1h0m0s
-cache.prune_threshold = -1h0m0s
+#cache.prune_delay = 1h0m0s
+#cache.prune_threshold = -1h0m0s
diff --git a/testdata/localhost.cert.pem b/testdata/localhost.cert.pem
index 4321f0f..283443b 100644
--- a/testdata/localhost.cert.pem
+++ b/testdata/localhost.cert.pem
@@ -1,34 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIIF7TCCA9WgAwIBAgICEAEwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAklE
-MRIwEAYDVQQIDAlXZXN0IEphdmExEDAOBgNVBAoMB0tpbGFiaXQxETAPBgNVBAsM
-CFN5c2FkbWluMSAwHgYDVQQDDBdLaWxhYml0IEludGVybWVkaWF0ZSBDQTEeMBwG
-CSqGSIb3DQEJARYPbXNAa2lsYWJpdC5pbmZvMB4XDTE5MDEyNjExMjAxMloXDTIw
-MDIwNTExMjAxMlowgYwxCzAJBgNVBAYTAklEMRIwEAYDVQQIDAlXZXN0IEphdmEx
-EDAOBgNVBAcMB0JhbmR1bmcxEDAOBgNVBAoMB0tpbGFiaXQxETAPBgNVBAsMCFN5
-c2FkbWluMRIwEAYDVQQDDAlsb2NhbGhvc3QxHjAcBgkqhkiG9w0BCQEWD21zQGtp
-bGFiaXQuaW5mbzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrMp0Uz
-GqxqigdU/EVUsvCRs8PYdALbokLlDrZOWA+l1MSkRZ3UcJ5z9SrD+iZXl/IRPki0
-VJ9LjPjXqPjPhMkPCp9kDJBOhZ9OJ6P8v5/eMbUgyVpqOWe6j80VS341R3tD80bN
-BmX+hUijohSfqxSYD05z6a5ydYIbkY6/9TmraJav9wsyA67f5KmkGm5bx05+55PC
-DjS36jit2MQMcYJPG75jAhpbERtv6SdXTQhCqVehXnbx09ioj0u9x9fT6fo8gCWu
-vhvkO64lccNZJ1lmpoxPeSR+puo7ua1BcnV+let1PuuRCaENYnqiIX4exYPmRaj7
-/MBbkdXMOhq9nV0CAwEAAaOCAVkwggFVMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEB
-BAQDAgZAMDMGCWCGSAGG+EIBDQQmFiRPcGVuU1NMIEdlbmVyYXRlZCBTZXJ2ZXIg
-Q2VydGlmaWNhdGUwHQYDVR0OBBYEFG/gGvNe8dqGz2OlaB06RFQyQ/lEMIG7BgNV
-HSMEgbMwgbCAFPsmyYtis5UPze/f8kO7OXgZWocnoYGTpIGQMIGNMQswCQYDVQQG
-EwJJRDESMBAGA1UECAwJV2VzdCBKYXZhMRAwDgYDVQQHDAdCYW5kdW5nMRAwDgYD
-VQQKDAdLaWxhYml0MREwDwYDVQQLDAhTeXNhZG1pbjETMBEGA1UEAwwKS2lsYWJp
-dCBDQTEeMBwGCSqGSIb3DQEJARYPbXNAa2lsYWJpdC5pbmZvggIQADAOBgNVHQ8B
-Af8EBAMCBaAwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcNAQELBQADggIB
-AHHaj/ZwSjek/y7UpSRXLlRrjUHJt6szgfNz5sQ77es+TF5iMi2YgixmdalFndAb
-1IaAlTO1mIPdIwKu45cUtCrO/WRZKA9A1Q4QbT1XBl5o3dZG55xjmdgzymLlLJ+h
-hxkc1AzHToyQ5lJUHXnuE3vJHOYYBhxsJ5LBQ/NeLTRFiZKqsZUhvqinQFlZygF8
-7x45pIONS/mfvroaJgs1sqcdG8T5eeFkNNAIfN2mS/xobCqNDvowokNoMSGT+7U6
-0QR6qkWbhSnnoKXGZTz5RMtDGraSXNA/PWdCPTMgfWSkwe6x32zTWeogIZaiJF/R
-w699a++vyUQmRRwH5gDugtfjj/xYaM4XaGoMM9A1NB/LxVerTNKTNBqFZB8xS1dP
-KptOOoQMybsjyeOmB1VO5ZcdFyG6e+c3D/NhJQ6MJigks8L5BhBuv2uYa1Xc411y
-k4Cjo0Cm1dKyCMYMu012RXfv0/+7q/ThUSKN5thgDra3CbtWPn1/cxb0e2nhzGKy
-CGXQzHrpE59GDLcnv+PXaqdMVWaClFnBGj6sW+4wy7dr5+nS8GWunF6GqpfnAQfu
-KKqy10EdwpaFDUizyLqkrwTIJbxYvIUYHrZ3+up3RD6O2WqfAMn6HNDK2DBskthG
-K1NCGLrJzU81eBNFf4AGWAdUG3YyvXMat6WGZbAtFZ//
+MIIDejCCAmICCQCnpfFMJ730PjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJJ
+RDEVMBMGA1UECgwMaW5mby5raWxhYml0MR8wHQYDVQQLDBZpbmZvLmtpbGFiaXQu
+cmVzY2FjaGVkMRgwFgYDVQQDDA9yZXNjYWNoZWQubG9jYWwxHjAcBgkqhkiG9w0B
+CQEWD21zQGtpbGFiaXQuaW5mbzAeFw0yMTAxMjQxNDQ3MDhaFw0zMTAxMjIxNDQ3
+MDhaMH8xCzAJBgNVBAYTAklEMRUwEwYDVQQKDAxpbmZvLmtpbGFiaXQxHzAdBgNV
+BAsMFmluZm8ua2lsYWJpdC5yZXNjYWNoZWQxGDAWBgNVBAMMD3Jlc2NhY2hlZC5s
+b2NhbDEeMBwGCSqGSIb3DQEJARYPbXNAa2lsYWJpdC5pbmZvMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAusynRTMarGqKB1T8RVSy8JGzw9h0AtuiQuUO
+tk5YD6XUxKRFndRwnnP1KsP6JleX8hE+SLRUn0uM+Neo+M+EyQ8Kn2QMkE6Fn04n
+o/y/n94xtSDJWmo5Z7qPzRVLfjVHe0PzRs0GZf6FSKOiFJ+rFJgPTnPprnJ1ghuR
+jr/1Oatolq/3CzIDrt/kqaQablvHTn7nk8IONLfqOK3YxAxxgk8bvmMCGlsRG2/p
+J1dNCEKpV6FedvHT2KiPS73H19Pp+jyAJa6+G+Q7riVxw1knWWamjE95JH6m6ju5
+rUFydX6V63U+65EJoQ1ieqIhfh7Fg+ZFqPv8wFuR1cw6Gr2dXQIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQChJw/+7NQtOgfNtykJzX7/M5i8uyG6vupT88C7Y7p0aINH
+EpbhrBx3WLQUHKAYE2gyLtBW5UtJFRUFRWy9h/FQxnilOrptF1UPiPlcsyvM160N
+T1tjz4mofhtL7kSYm1W2rFHzYH+acoq1p7GrcxNqzJbMmyQKYxzZeoeWRFyk442L
+lI4YV5/qRZidWoFH6pykN7YSKv0SO+m4U1f0v8CzgV+VyLcvXF4E9kWuKuSBiAUH
+KUvep4ECrcArKuCrAtmAtpUYUQFO60SPCTsuEqZ0SnBIovvwEpMFYK6zoOP6eP5R
+8f2nAjyVsuon9Sz/Vh/InG3v3kbxy+EZKQRWEhFx
 -----END CERTIFICATE-----