diff options
| -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 2b4a0d8e13..799e207866 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 \subsection{Starting Two Peers by Hand} +This section describes how to start two peers on the same machine by hand. +The process is rather painful, but the description is somewhat instructive. +In practice, you might prefer the automated method described in +Section~\ref{sec:testbed}. + \subsubsection{Setup a second peer} We will now start a second peer on your machine. 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 Now you have to edit {\tt peer2.conf} and change: \begin{itemize} \itemsep0em - \item{\texttt{SERVICEHOME} under \texttt{PATHS}} + \item{\texttt{GNUNET\_TEST\_HOME} under \texttt{PATHS}} \item{Every (uncommented) value for ``\texttt{PORT}'' (add 10000) in any section (the option may be commented out if \texttt{PORT} is prefixed by "\#", in this case, UNIX domain sockets are used @@ -460,7 +465,7 @@ $ gnunet-core -c peer1.conf Peer `9TVUCS8P5A7ILLBGO6 [...shortened...] 1KNBJ4NGCHP3JPVULDG' \end{lstlisting} -\subsection{Starting Peers Using the Testbed Service} +\subsection{Starting Peers Using the Testbed Service} \label{sec:testbed} GNUnet's testbed service is used for testing scenarios where a number of peers 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 ecc94ead00..ceb5fdcbba 100644 --- a/src/util/util.conf +++ b/src/util/util.conf @@ -37,9 +37,8 @@ GNUNET_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-system-runtime/ GNUNET_USER_RUNTIME_DIR = ${TMPDIR:-${TMP:-/tmp}}/gnunet-${USERHOME:-${USER:-user}}-runtime/ -# Legacy option... -# GNUNET_TEST_HOME = ~/.gnunet/ -# GNUNET_TEST_HOME = /var/lib/gnunet/ +# Override for GNUNET_HOME used by test cases. +# GNUNET_TEST_HOME = /tmp/foo/bar # DEFAULTCONFIG = /etc/gnunet.conf # If 'DEFAULTCONFIG' is not defined, the current |