zoneconf.in: Fix the resign interval.

[zoneconf] / zoneconf.in

diff --git a/zoneconf.in b/zoneconf.in
index 8197a4d4db5795268ef4792a1b4a47007294fd80..7af2845b5e69e602e177cbb773330b4de51819ca 100755 (executable)
--- a/zoneconf.in
+++ b/zoneconf.in
@@ -1000,7 +1000,7 @@ define-configuration-space zone ZONECFG {
           "-S" \
           "-K%h/key" \
           "-d%h/ds" \
-          "-s-3600" "-e+176400" \
+          "-s-3600" "-e+176400" "-i90000" \
           "-N%q" \
           "-o%z" \
           "-f%o" \
@@ -1223,7 +1223,7 @@ proc sign-zone-file {info soafmt infile} {
 
   array set zone $info
   set outfile "$zone(server-file-name).new"
-  if {![run "zone `$zone(name)' in view `$zone(mapped-view)'" \
+  if {![run "sign zone `$zone(name)' in view `$zone(mapped-view)'" \
            $zone(signzone-command) \
            "%h" $zone(home-dir) \
            "%m" $zone(static-dir) \
@@ -1351,8 +1351,8 @@ defcmd update {} {
 defcmd install {user view name} {
   help-text "Install a new zone file.
 
-           The file is for the given zone NAME and \(user-side) VIEW.  The file is
-           provided by the named USER"
+The file is for the given zone NAME and \(user-side) VIEW.  The file is
+provided by the named USER."
 } {
   global QUIS ZONECFG ZONES CONFFILE errorInfo errorCode
 
@@ -1426,7 +1426,7 @@ defcmd install {user view name} {
     }
 
     ## If the zone wants signing, better to do that now.
-    if {![sign-zone-file $matchinfo keep $tmp]} {
+    if {$zone(sign) && ![sign-zone-file $matchinfo keep $tmp]} {
       eval $cleanup
       exit 2
     }