X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=utils%2Fnewclient.sh;h=98957ef6fb4bc6e604993c900caf707a10bb6fb4;hb=2f3299c343b4036718f254d9c23f147ba1bc0161;hp=e0d8c855b8fad14f1b3c8538242d0eb741c5b581;hpb=5ee5b99c6def5751dc4e1e9d36ea5fb48d61793b;p=govpn.git

diff --git a/utils/newclient.sh b/utils/newclient.sh
index e0d8c85..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 asks for passphrase, generates verifier and shows you example
-JSON entry for server configuration.
+YAML entry for server configuration.
 
 Usage: $0 <username>
 EOF
@@ -12,11 +14,7 @@ EOF
 }
 
 username=$1
-umask 077
-passphrase=$(mktemp)
-$(dirname $0)/storekey.sh $passphrase
-verifier=$(govpn-verifier -key $passphrase)
-rm -f $passphrase
+verifier=$(govpn-verifier)
 verifierS=$(echo $verifier | sed 's/^\(.*\) .*$/\1/')
 verifierC=$(echo $verifier | sed 's/^.* \(.*\)$/\1/')
 echo
@@ -24,28 +22,10 @@ echo
 cat <<EOF
 Your client verifier is: $verifierC
 
-Place the following JSON configuration entry on the server's side:
-
-    "$username": {
-        "up": "/path/to/up.sh",
-        "verifier": "$verifierS"
-    }
-
-Verifier was generated with:
-
-    $(dirname $0)/storekey.sh /tmp/passphrase
-    govpn-verifier -key /tmp/passphrase
-
-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