X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=doc%2Fexample.texi;h=c26284650498e9b2a7e5ff290dc3799bdf0a93e0;hb=b71b594e74ccbbfc987a787c45158598c2f807c7;hp=9fb3ad1685383f98e7da46a738f5726c25260953;hpb=0c6f6e443c37addce07cb3d1cd337c62a234e90d;p=govpn.git

diff --git a/doc/example.texi b/doc/example.texi
index 9fb3ad1..c262846 100644
--- a/doc/example.texi
+++ b/doc/example.texi
@@ -15,44 +15,38 @@ is 1432.
 @end itemize
 
 @strong{Install}. At first you must @ref{Installation, install} this
-software: download, check the signature, compile.
+software: download, @ref{Integrity, check the signature}, compile.
 
-@strong{Prepare the server}. Create the new client, named (for example)
-"Alice":
+@strong{Prepare the client}. Generate client's identity and verifier for
+Alice as an example:
+@verbatim
+client% ./utils/newclient.sh Alice
+Enter passphrase:
+Your id is: 7012df29deee2170594119df5091d4a2
 
-@example
-server% ./utils/newclient.sh Alice
-Place verifier to peers/6d4ac605ce8dc37c2f0bf21cb542a713/verifier
-@end example
-
-"6d4ac605ce8dc37c2f0bf21cb542a713" -- is the new client's identity.
-
-@strong{Prepare the client}. Generate @ref{Verifier} for known client
-identity:
+Place the following JSON configuration entry on the server's side:
 
-@example
-client% ./utils/storekey.sh /tmp/passphrase
-Enter passphrase:[my secure passphrase is here]
-client% govpn-verifier -id 6d4ac605ce8dc37c2f0bf21cb542a713 -key /tmp/passphrase
-562556cc9ecf0019b4cf45bcdf42706944ae9b3ac7c73ad299d83f2d5a169c55
-client% rm /tmp/passphrase
-@end example
+    "7012df29deee2170594119df5091d4a2": {
+        "name": "Alice",
+        "up": "/path/to/up.sh",
+        "verifier": "fb43255ca3fe5bd884e364e5eae0cd37ad14774930a027fd38d8938fd0b57425"
+    }
 
-"562556cc9ecf0019b4cf45bcdf42706944ae9b3ac7c73ad299d83f2d5a169c55" --
-this is verifier itself.
+Verifier was generated with:
 
-@strong{Save verifier on server}.
+    ./utils/storekey.sh /tmp/passphrase
+    govpn-verifier -id 7012df29deee2170594119df5091d4a2 -key /tmp/passphrase
+@end verbatim
 
-@example
-server% cat > peers/6d4ac605ce8dc37c2f0bf21cb542a713/verifier <<EOF
-562556cc9ecf0019b4cf45bcdf42706944ae9b3ac7c73ad299d83f2d5a169c55
-EOF
-@end example
+@strong{Prepare the server}. Add this entry to @code{peers.json}
+configuration file.
 
 @strong{Prepare network on GNU/Linux IPv4 server}:
 
 @example
-server% echo "echo tap10" >> peers/6d4ac605ce8dc37c2f0bf21cb542a713/up.sh
+server% umask 077
+server% echo "#!/bin/sh" > /path/to/up.sh
+server% echo "echo tap10" >> /path/to/up.sh
 server% ip addr add 192.168.0.1/24 dev wlan0
 server% tunctl -t tap10
 server% ip link set mtu 1432 dev tap10
@@ -83,7 +77,7 @@ client% ip route add default via 172.16.0.1
 @example
 client% govpn-client \
     -key key.txt \
-    -id 6d4ac605ce8dc37c2f0bf21cb542a713 \
+    -id 906e34b98750c4f686d6c5489508763c \
     -iface tap10 \
     -remote 192.168.0.1:1194 \
     -mtu 1472
@@ -103,7 +97,7 @@ client% ifconfig tap10 inet6 fc00::2/96 mtu 1412 up
 client% route -6 add default fc00::1
 client% govpn-client \
     -key key.txt \
-    -id 6d4ac605ce8dc37c2f0bf21cb542a713 \
+    -id 906e34b98750c4f686d6c5489508763c \
     -iface tap10 \
     -remote "[fe80::1%me0]":1194
 @end example