X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=bin%2Fkey-gen;h=bf2a8191fcd6da179577b4f35bacc925d5bd4394;hb=674bba0d833cd91ca5fa71173b7e2f95c20502fa;hp=b73fd59f60bb665ed5dedc5cfd628b15b4e5a122;hpb=57e60f9a9bd96a6cd81651dfd8b833ea82c509c6;p=nsc-5.git

diff --git a/bin/key-gen b/bin/key-gen
index b73fd59..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 <zone> [<extra-keygen-params>]"
+	echo >&2 "Usage: $0 <config> [<extra-keygen-params>]"
 	exit 1
 fi
-D="$1"
+C="$1"
 shift
 
-mkdir -p keys/$D
-dnssec-keygen $KEYGEN_OPTIONS -K keys/$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