X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=utils%2Fnewclient.sh;h=98957ef6fb4bc6e604993c900caf707a10bb6fb4;hb=a11b0bda178937e6891770f40f800d69b5640313;hp=9e1cb3578faaf71f131245cf2c128b2df3d07c06;hpb=b71b594e74ccbbfc987a787c45158598c2f807c7;p=govpn.git

diff --git a/utils/newclient.sh b/utils/newclient.sh
index 9e1cb35..98957ef 100755
--- a/utils/newclient.sh
+++ b/utils/newclient.sh
@@ -1,10 +1,12 @@
 #!/bin/sh -e
 
+PATH=$PATH:.
+
 [ -n "$1" ] || {
     cat <<EOF
 Example script for creating new user peer for GoVPN.
-It generates random client's identity, ask for passphrase, generates
-verifier and shows you example JSON entry for server configuration.
+It asks for passphrase, generates verifier and shows you example
+YAML entry for server configuration.
 
 Usage: $0 <username>
 EOF
@@ -12,41 +14,18 @@ EOF
 }
 
 username=$1
-peerid=$(dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -ve '"%02x"')
-[ $(echo -n $peerid | wc -c) = 32 ] || peerid=0"$peerid"
-umask 077
-passphrase=$(mktemp)
-$(dirname $0)/storekey.sh $passphrase
-verifier=$(govpn-verifier -id $peerid -key $passphrase)
-rm -f $passphrase
+verifier=$(govpn-verifier)
+verifierS=$(echo $verifier | sed 's/^\(.*\) .*$/\1/')
+verifierC=$(echo $verifier | sed 's/^.* \(.*\)$/\1/')
 echo
 
 cat <<EOF
-Your id is: $peerid
-
-Place the following JSON configuration entry on the server's side:
-
-    "$peerid": {
-        "name": "$username",
-        "up": "/path/to/up.sh",
-        "verifier": "$verifier"
-    }
-
-Verifier was generated with:
-
-    $(dirname $0)/storekey.sh /tmp/passphrase
-    govpn-verifier -id $peerid -key /tmp/passphrase
+Your client verifier is: $verifierC
 
-Create up.sh script that will output on the first line TAP interface
-name that must be used for the peer. For example:
+Place the following YAML configuration entry on the server's side:
 
-    % umask 077
-    % ed /path/to/up.sh
-    a
-    #!/bin/sh
-    echo tap0
-    .
-    wq
-    20
-    % chmod +x /path/to/up.sh
+    $username:
+        up: /path/to/up.sh
+        iface: or TUN/TAP interface name
+        verifier: $verifierS
 EOF