diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-03-13 13:50:10 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-03-13 13:50:10 +0100 |
commit | 37b4006a8e89a6ad6b2f900aa98c7afacad6af26 (patch) | |
tree | a1754d82c2b4f167e3d7276be9232b687bf22a1d | |
parent | f7ef810b99d2c47d5a07739ecb0be1667f32567f (diff) | |
download | gnunet-37b4006a8e89a6ad6b2f900aa98c7afacad6af26.tar.gz gnunet-37b4006a8e89a6ad6b2f900aa98c7afacad6af26.zip |
fix tutorial: SERVICEHOME is obsolete, we now have GNUNET_TEST_HOME
-rw-r--r-- | doc/gnunet-c-tutorial.tex | 9 | ||||
-rw-r--r-- | src/util/util.conf | 5 |
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/gnunet-c-tutorial.tex b/doc/gnunet-c-tutorial.tex index 2b4a0d8e1..799e20786 100644 --- a/doc/gnunet-c-tutorial.tex +++ b/doc/gnunet-c-tutorial.tex | |||
@@ -355,6 +355,11 @@ $ gnunet-statistics -c ~/peer1.conf -s dht # print statistics about DHT service | |||
355 | 355 | ||
356 | \subsection{Starting Two Peers by Hand} | 356 | \subsection{Starting Two Peers by Hand} |
357 | 357 | ||
358 | This section describes how to start two peers on the same machine by hand. | ||
359 | The process is rather painful, but the description is somewhat instructive. | ||
360 | In practice, you might prefer the automated method described in | ||
361 | Section~\ref{sec:testbed}. | ||
362 | |||
358 | \subsubsection{Setup a second peer} | 363 | \subsubsection{Setup a second peer} |
359 | We will now start a second peer on your machine. | 364 | We will now start a second peer on your machine. |
360 | For the second peer, you will need to manually create a modified | 365 | For the second peer, you will need to manually create a modified |
@@ -376,7 +381,7 @@ $ cat $PREFIX/share/gnunet/config.d/*.conf > peer2.conf | |||
376 | Now you have to edit {\tt peer2.conf} and change: | 381 | Now you have to edit {\tt peer2.conf} and change: |
377 | \begin{itemize} | 382 | \begin{itemize} |
378 | \itemsep0em | 383 | \itemsep0em |
379 | \item{\texttt{SERVICEHOME} under \texttt{PATHS}} | 384 | \item{\texttt{GNUNET\_TEST\_HOME} under \texttt{PATHS}} |
380 | \item{Every (uncommented) value for ``\texttt{PORT}'' (add 10000) in any | 385 | \item{Every (uncommented) value for ``\texttt{PORT}'' (add 10000) in any |
381 | section (the option may be commented out if \texttt{PORT} is | 386 | section (the option may be commented out if \texttt{PORT} is |
382 | prefixed by "\#", in this case, UNIX domain sockets are used | 387 | prefixed by "\#", in this case, UNIX domain sockets are used |
@@ -460,7 +465,7 @@ $ gnunet-core -c peer1.conf | |||
460 | Peer `9TVUCS8P5A7ILLBGO6 [...shortened...] 1KNBJ4NGCHP3JPVULDG' | 465 | Peer `9TVUCS8P5A7ILLBGO6 [...shortened...] 1KNBJ4NGCHP3JPVULDG' |
461 | \end{lstlisting} | 466 | \end{lstlisting} |
462 | 467 | ||
463 | \subsection{Starting Peers Using the Testbed Service} | 468 | \subsection{Starting Peers Using the Testbed Service} \label{sec:testbed} |
464 | 469 | ||
465 | GNUnet's testbed service is used for testing scenarios where a number of peers | 470 | GNUnet's testbed service is used for testing scenarios where a number of peers |
466 | are to be started. The testbed can manage peers on a single host or on multiple | 471 | are to be started. The testbed can manage peers on a single host or on multiple |
diff --git a/src/util/util.conf b/src/util/util.conf index ecc94ead0..ceb5fdcbb 100644 --- a/src/util/util.conf +++ b/src/util/util.conf | |||
@@ -37,9 +37,8 @@ GNUNET_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-system-runtime/ | |||
37 | GNUNET_USER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-${USERHOME:-${USER:-user}}-runtime/ | 37 | GNUNET_USER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-${USERHOME:-${USER:-user}}-runtime/ |
38 | 38 | ||
39 | 39 | ||
40 | # Legacy option... | 40 | # Override for GNUNET_HOME used by test cases. |
41 | # GNUNET_TEST_HOME = ~/.gnunet/ | 41 | # GNUNET_TEST_HOME = /tmp/foo/bar |
42 | # GNUNET_TEST_HOME = /var/lib/gnunet/ | ||
43 | 42 | ||
44 | # DEFAULTCONFIG = /etc/gnunet.conf | 43 | # DEFAULTCONFIG = /etc/gnunet.conf |
45 | # If 'DEFAULTCONFIG' is not defined, the current | 44 | # If 'DEFAULTCONFIG' is not defined, the current |