diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2017-06-10 11:59:18 +0200 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2017-06-21 19:29:57 +0200 |
| commit | f3853a259b9b0588f6ae4f32c5c56a77ab096e86 (patch) | |
| tree | 3acb0bb43f8eff1db6db01c8420ca0df5d56c7e9 /gnu/services | |
| parent | afd06f605bf88a796acefc7ed598b43879346a6b (diff) | |
| download | guix-f3853a259b9b0588f6ae4f32c5c56a77ab096e86.tar guix-f3853a259b9b0588f6ae4f32c5c56a77ab096e86.tar.gz | |
gnu: services: use seconds instead of duration strings.
* gnu/services/dns.scm (zone-file, knot-policy-configuration): Use numbers
instead of duration strings.
(verify-knot-policy-configuration): Fix typo.
* doc/guix.texi (DNS Services): Update documentation.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/dns.scm | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gnu/services/dns.scm b/gnu/services/dns.scm index 2ed7b9e22f..673ab1a98d 100644 --- a/gnu/services/dns.scm +++ b/gnu/services/dns.scm @@ -99,13 +99,13 @@ (serial zone-file-serial (default 1)) (refresh zone-file-refresh - (default "2d")) + (default (* 2 24 3600))) (retry zone-file-retry - (default "15m")) + (default (* 15 60))) (expiry zone-file-expiry - (default "2w")) + (default (* 2 7 24 3600))) (nx zone-file-nx - (default "1h"))) + (default 3600))) (define-record-type* <knot-keystore-configuration> knot-keystore-configuration make-knot-keystore-configuration knot-keystore-configuration? @@ -136,13 +136,13 @@ (dnskey-ttl knot-policy-configuration-dnskey-ttl (default 'default)) (zsk-lifetime knot-policy-configuration-zsk-lifetime - (default "30d")) + (default (* 30 24 3600))) (propagation-delay knot-policy-configuration-propagation-delay - (default "1d")) + (default (* 24 3600))) (rrsig-lifetime knot-policy-configuration-rrsig-lifetime - (default "14d")) + (default (* 14 24 3600))) (rrsig-refresh knot-policy-configuration-rrsig-refresh - (default "7d")) + (default (* 7 24 3600))) (nsec3? knot-policy-configuration-nsec3? (default #f)) (nsec3-iterations knot-policy-configuration-nsec3-iterations @@ -150,7 +150,7 @@ (nsec3-salt-length knot-policy-configuration-nsec3-salt-length (default 8)) (nsec3-salt-lifetime knot-policy-configuration-nsec3-salt-lifetime - (default "30d"))) + (default (* 30 24 3600)))) (define-record-type* <knot-zone-configuration> knot-zone-configuration make-knot-zone-configuration @@ -248,7 +248,7 @@ (error-out "backend must be one of: 'pem or 'pkcs11"))) (define (verify-knot-policy-configuration policy) - (unless (knot-keystore-configuration? policy) + (unless (knot-policy-configuration? policy) (error-out "policies must be a list of only knot-policy-configuration.")) (let ((id (knot-policy-configuration-id policy))) (unless (and (string? id) (not (equal? id ""))) |