Use YAML instead of JSON for server configuration file

[govpn.git] / utils / newclient.sh

diff --git a/utils/newclient.sh b/utils/newclient.sh
index e0d8c855b8fad14f1b3c8538242d0eb741c5b581..44c7ef5e977c044a369a26ad1c1ce185dcaad996 100755 (executable)
--- 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
@@ -24,28 +26,15 @@ echo
 cat <<EOF
 Your client verifier is: $verifierC
 
-Place the following JSON configuration entry on the server's side:
+Place the following YAML configuration entry on the server's side:
 
-    "$username": {
-        "up": "/path/to/up.sh",
-        "verifier": "$verifierS"
-    }
+    $username:
+        up: /path/to/up.sh
+        iface: or TAP interface name
+        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:
-
-    % umask 077
-    % ed /path/to/up.sh
-    a
-    #!/bin/sh
-    echo tap0
-    .
-    wq
-    20
-    % chmod +x /path/to/up.sh
 EOF