X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bin%2Fkey-gen;h=bf2a8191fcd6da179577b4f35bacc925d5bd4394;hb=a792de3f1755b621d65f0874de7ecef806d95c57;hp=686e8ca6be0994163ba07daba06b045310e13a16;hpb=2c5837136158422b198dd306e66f71c4db87182f;p=nsc-5.git

diff --git a/bin/key-gen b/bin/key-gen
index 686e8ca..bf2a819 100755
--- a/bin/key-gen
+++ b/bin/key-gen
@@ -6,12 +6,20 @@ set -e
 . bin/shell-env
 
 if [ -z "$1" ] ; then
-	echo >&2 "Usage: $0 <domain> [<extra-keygen-params>]"
+	echo >&2 "Usage: $0 <config> [<extra-keygen-params>]"
 	exit 1
 fi
-D="$1"
+C="$1"
 shift
 
-mkdir -p $KEYDIR/$D
-dnssec-keygen $KEYGEN_OPTIONS -K $KEYDIR/$D "$@" $D
-bin/key-update $D
+if [ ! -f $CFDIR/$C ] ; then
+	echo >&2 "$CFDIR/$C: No such configuration file"
+	exit 1
+fi
+
+Z=$($M4 m4/mkname.m4 $CFDIR/$C)
+echo "Zone name: $Z"
+
+mkdir -p keys/$C
+dnssec-keygen $KEYGEN_OPTIONS -K keys/$C "$@" $Z
+bin/key-update $C