diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-04-30 10:54:52 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-04-30 10:54:52 +0200 |
commit | bdf8e76fc9b72f2000e33f479a15919811a5f312 (patch) | |
tree | 189799fb7f8f4b94db9f4622818a6ac71af9d39e | |
parent | c89e2dcd8976e45c85aef5cc77e2b96baffd4980 (diff) | |
download | gnunet-bdf8e76fc9b72f2000e33f479a15919811a5f312.tar.gz gnunet-bdf8e76fc9b72f2000e33f479a15919811a5f312.zip |
remove remarks about obsolete gnunet-gns-import
-rw-r--r-- | doc/documentation/chapters/installation.texi | 47 | ||||
-rw-r--r-- | doc/man/gnunet-namestore-fcfsd.1 | 2 |
2 files changed, 17 insertions, 32 deletions
diff --git a/doc/documentation/chapters/installation.texi b/doc/documentation/chapters/installation.texi index eeb14473b..3a76fb162 100644 --- a/doc/documentation/chapters/installation.texi +++ b/doc/documentation/chapters/installation.texi | |||
@@ -294,7 +294,7 @@ If you want to be able to enable DEBUG-level log messages, add | |||
294 | @command{./configure} command. | 294 | @command{./configure} command. |
295 | @code{DEBUG}-level log messages are in English only and | 295 | @code{DEBUG}-level log messages are in English only and |
296 | should only be useful for developers (or for filing | 296 | should only be useful for developers (or for filing |
297 | really detailed bug reports). | 297 | really detailed bug reports). |
298 | 298 | ||
299 | Finally, you probably want to compile @command{gnunet-gtk}, which | 299 | Finally, you probably want to compile @command{gnunet-gtk}, which |
300 | includes @command{gnunet-setup} (a graphical tool for | 300 | includes @command{gnunet-setup} (a graphical tool for |
@@ -389,10 +389,9 @@ For those services, systems with more than one user may require each user | |||
389 | to specify a different port number in their personal configuration file. | 389 | to specify a different port number in their personal configuration file. |
390 | 390 | ||
391 | Finally, the user should perform the basic initial setup for the GNU Name | 391 | Finally, the user should perform the basic initial setup for the GNU Name |
392 | System (GNS). This is done by running two commands: | 392 | System (GNS) certificate authority. This is done by running: |
393 | 393 | ||
394 | @example | 394 | @example |
395 | $ gnunet-gns-import.sh | ||
396 | $ gnunet-gns-proxy-setup-ca | 395 | $ gnunet-gns-proxy-setup-ca |
397 | @end example | 396 | @end example |
398 | 397 | ||
@@ -420,7 +419,7 @@ hosts: files gns [NOTFOUND=return] mdns4_minimal \ | |||
420 | 419 | ||
421 | @c FIXME: Document new behavior. | 420 | @c FIXME: Document new behavior. |
422 | You might want to make sure that @file{/lib/libnss_gns.so.2} exists on | 421 | You might want to make sure that @file{/lib/libnss_gns.so.2} exists on |
423 | your system, it should have been created during the installation. | 422 | your system, it should have been created during the installation. |
424 | 423 | ||
425 | @node Build instructions for Ubuntu 12.04 using Git | 424 | @node Build instructions for Ubuntu 12.04 using Git |
426 | @section Build instructions for Ubuntu 12.04 using Git | 425 | @section Build instructions for Ubuntu 12.04 using Git |
@@ -802,7 +801,7 @@ $ gpg --keyserver pgp.mit.edu --recv-keys A88C8ADD129828D7EAC02E52E22F9BBFEE3485 | |||
802 | @end example | 801 | @end example |
803 | 802 | ||
804 | @noindent | 803 | @noindent |
805 | and rerun the gpg --verify command. | 804 | and rerun the gpg --verify command. |
806 | 805 | ||
807 | @example | 806 | @example |
808 | $ tar xvf gnurl-7.57.0.tar.xz | 807 | $ tar xvf gnurl-7.57.0.tar.xz |
@@ -1418,7 +1417,7 @@ as a normal user. | |||
1418 | We begin by installing a few Debian packages from stable: | 1417 | We begin by installing a few Debian packages from stable: |
1419 | 1418 | ||
1420 | @example | 1419 | @example |
1421 | # apt-get install gcc make python-zbar libltdl-dev libsqlite3-dev \ | 1420 | # apt-get install gcc make python-zbar libltdl-dev libsqlite3-dev \ |
1422 | libunistring-dev libopus-dev libpulse-dev openssl libglpk-dev texlive \ | 1421 | libunistring-dev libopus-dev libpulse-dev openssl libglpk-dev texlive \ |
1423 | libidn11-dev libmysqlclient-dev libpq-dev libarchive-dev libbz2-dev \ | 1422 | libidn11-dev libmysqlclient-dev libpq-dev libarchive-dev libbz2-dev \ |
1424 | libflac-dev libgif-dev libglib2.0-dev libgtk-3-dev libmpeg2-4-dev \ | 1423 | libflac-dev libgif-dev libglib2.0-dev libgtk-3-dev libmpeg2-4-dev \ |
@@ -1633,7 +1632,7 @@ have to compile it from source: | |||
1633 | @item Unzip the downloaded source tarball using your favourite | 1632 | @item Unzip the downloaded source tarball using your favourite |
1634 | unzipper application In the MSYS shell | 1633 | unzipper application In the MSYS shell |
1635 | 1634 | ||
1636 | @item change to the respective directory | 1635 | @item change to the respective directory |
1637 | 1636 | ||
1638 | @item Configure glpk for "i686-pc-mingw32": | 1637 | @item Configure glpk for "i686-pc-mingw32": |
1639 | 1638 | ||
@@ -1781,7 +1780,7 @@ $ make install | |||
1781 | This document is a @b{DEPRECATED} installation guide for GNUnet on | 1780 | This document is a @b{DEPRECATED} installation guide for GNUnet on |
1782 | Windows. | 1781 | Windows. |
1783 | It will not work for recent GNUnet versions, but maybe it will be of | 1782 | It will not work for recent GNUnet versions, but maybe it will be of |
1784 | some use if problems arise. | 1783 | some use if problems arise. |
1785 | 1784 | ||
1786 | The Windows build uses a UNIX emulator for Windows, | 1785 | The Windows build uses a UNIX emulator for Windows, |
1787 | @uref{http://www.mingw.org/, MinGW}, to build the executable modules. | 1786 | @uref{http://www.mingw.org/, MinGW}, to build the executable modules. |
@@ -1799,7 +1798,7 @@ We regret any inconvenience, and if you have problems, please report them. | |||
1799 | * Installer:: | 1798 | * Installer:: |
1800 | * Source:: | 1799 | * Source:: |
1801 | @end menu | 1800 | @end menu |
1802 | 1801 | ||
1803 | @node Hardware and OS requirements | 1802 | @node Hardware and OS requirements |
1804 | @subsubsection Hardware and OS requirements | 1803 | @subsubsection Hardware and OS requirements |
1805 | 1804 | ||
@@ -1878,7 +1877,7 @@ This batch file opens a shell which is used to invoke the build | |||
1878 | processes. | 1877 | processes. |
1879 | MinGW's standard shell (@command{msys.bat}) is not suitable | 1878 | MinGW's standard shell (@command{msys.bat}) is not suitable |
1880 | because it opens a separate console window. | 1879 | because it opens a separate console window. |
1881 | On Vista, @command{bash.bat} needs to be run as Administrator. | 1880 | On Vista, @command{bash.bat} needs to be run as Administrator. |
1882 | 1881 | ||
1883 | @item | 1882 | @item |
1884 | Start @command{bash.sh} and rename | 1883 | Start @command{bash.sh} and rename |
@@ -1948,7 +1947,7 @@ directory (@file{c:\mingw\mingw}). | |||
1948 | 1947 | ||
1949 | @item @strong{SQLite}@ | 1948 | @item @strong{SQLite}@ |
1950 | GNUnet uses the SQLite database to store data. | 1949 | GNUnet uses the SQLite database to store data. |
1951 | Get the prebuilt binary from here and unpack it to your MinGW directory. | 1950 | Get the prebuilt binary from here and unpack it to your MinGW directory. |
1952 | 1951 | ||
1953 | @item @strong{MySQL}@ | 1952 | @item @strong{MySQL}@ |
1954 | As an alternative to SQLite, GNUnet also supports MySQL. | 1953 | As an alternative to SQLite, GNUnet also supports MySQL. |
@@ -1984,7 +1983,7 @@ dlltool --input-def ../include/libmySQL.def \ | |||
1984 | --output-lib libmysqlclient.a -k | 1983 | --output-lib libmysqlclient.a -k |
1985 | @end example | 1984 | @end example |
1986 | 1985 | ||
1987 | @item Copy include\* to include\mysql\ | 1986 | @item Copy include\* to include\mysql\ |
1988 | 1987 | ||
1989 | @item Pass @code{--with-mysql=/c/mysql} to | 1988 | @item Pass @code{--with-mysql=/c/mysql} to |
1990 | @command{./configure} and copy @file{libmysql.dll} | 1989 | @command{./configure} and copy @file{libmysql.dll} |
@@ -2082,7 +2081,7 @@ debug information and are quite large. To compile release versions | |||
2082 | (small and fast) set the variable @code{CFLAGS}: | 2081 | (small and fast) set the variable @code{CFLAGS}: |
2083 | 2082 | ||
2084 | @example | 2083 | @example |
2085 | export CFLAGS='-O2 -march=pentium -fomit-frame-pointer' | 2084 | export CFLAGS='-O2 -march=pentium -fomit-frame-pointer' |
2086 | ./configure --prefix=$HOME --with-extractor=$HOME | 2085 | ./configure --prefix=$HOME --with-extractor=$HOME |
2087 | @end example | 2086 | @end example |
2088 | 2087 | ||
@@ -2097,7 +2096,7 @@ located in @file{contrib\win} in the GNUnet source tree. | |||
2097 | @subsubsection Source | 2096 | @subsubsection Source |
2098 | 2097 | ||
2099 | @c FIXME: URL | 2098 | @c FIXME: URL |
2100 | The sources of all dependencies are available here. | 2099 | The sources of all dependencies are available here. |
2101 | 2100 | ||
2102 | @c @node Portable GNUnet | 2101 | @c @node Portable GNUnet |
2103 | @c @section Portable GNUnet | 2102 | @c @section Portable GNUnet |
@@ -2372,7 +2371,7 @@ The hostlist client supports the following proxy types at the moment: | |||
2372 | @end itemize | 2371 | @end itemize |
2373 | 2372 | ||
2374 | In addition authentication at the proxy with username and password can be | 2373 | In addition authentication at the proxy with username and password can be |
2375 | configured. | 2374 | configured. |
2376 | 2375 | ||
2377 | To configure proxy support for the hostlist client in the | 2376 | To configure proxy support for the hostlist client in the |
2378 | @command{gnunet-setup} tool, select the "hostlist" tab and select | 2377 | @command{gnunet-setup} tool, select the "hostlist" tab and select |
@@ -2521,7 +2520,7 @@ inconsistencies. Some of the other databases do not support repair. | |||
2521 | @item Access mysql as root: | 2520 | @item Access mysql as root: |
2522 | 2521 | ||
2523 | @example | 2522 | @example |
2524 | $ mysql -u root -p | 2523 | $ mysql -u root -p |
2525 | @end example | 2524 | @end example |
2526 | 2525 | ||
2527 | @noindent | 2526 | @noindent |
@@ -3324,19 +3323,6 @@ steps. | |||
3324 | First of all, GNS needs to be integrated with the operating system. Most | 3323 | First of all, GNS needs to be integrated with the operating system. Most |
3325 | of this section is about the operating system level integration. | 3324 | of this section is about the operating system level integration. |
3326 | 3325 | ||
3327 | Additionally, each individual user who wants to use the system must also | ||
3328 | initialize their GNS zones. This can be done by running (after starting | ||
3329 | GNUnet) | ||
3330 | |||
3331 | @example | ||
3332 | $ gnunet-gns-import.sh | ||
3333 | @end example | ||
3334 | |||
3335 | @noindent | ||
3336 | after the local GNUnet peer has been started. Note that the namestore (in | ||
3337 | particular the namestore database backend) should not be reconfigured | ||
3338 | afterwards (as records are not automatically migrated between backends). | ||
3339 | |||
3340 | The remainder of this chapter will detail the various methods for | 3326 | The remainder of this chapter will detail the various methods for |
3341 | configuring the use of GNS with your operating system. | 3327 | configuring the use of GNS with your operating system. |
3342 | 3328 | ||
@@ -3528,7 +3514,7 @@ gnurl --version | |||
3528 | curl 7.56.0 (x86_64-unknown-linux-gnu) libcurl/7.56.0 \ | 3514 | curl 7.56.0 (x86_64-unknown-linux-gnu) libcurl/7.56.0 \ |
3529 | GnuTLS/3.5.13 zlib/1.2.11 libidn2/2.0.4 | 3515 | GnuTLS/3.5.13 zlib/1.2.11 libidn2/2.0.4 |
3530 | Release-Date: 2017-10-08 | 3516 | Release-Date: 2017-10-08 |
3531 | Protocols: http https | 3517 | Protocols: http https |
3532 | Features: AsynchDNS IDN IPv6 Largefile NTLM SSL libz \ | 3518 | Features: AsynchDNS IDN IPv6 Largefile NTLM SSL libz \ |
3533 | TLS-SRP UnixSockets HTTPS-proxy | 3519 | TLS-SRP UnixSockets HTTPS-proxy |
3534 | @end example | 3520 | @end example |
@@ -4125,4 +4111,3 @@ Furthermore, 'make install' will silently fail to set the DNS binaries to | |||
4125 | be owned by group "gnunetdns" unless that group already exists (!). | 4111 | be owned by group "gnunetdns" unless that group already exists (!). |
4126 | An alternative name for the "gnunetdns" group can be specified using the | 4112 | An alternative name for the "gnunetdns" group can be specified using the |
4127 | @code{--with-gnunetdns=GRPNAME} configure option. | 4113 | @code{--with-gnunetdns=GRPNAME} configure option. |
4128 | |||
diff --git a/doc/man/gnunet-namestore-fcfsd.1 b/doc/man/gnunet-namestore-fcfsd.1 index 3160910d4..8039e796f 100644 --- a/doc/man/gnunet-namestore-fcfsd.1 +++ b/doc/man/gnunet-namestore-fcfsd.1 | |||
@@ -13,7 +13,7 @@ Most users will not want to run an FCFS\-zone and thus will not need this progra | |||
13 | 13 | ||
14 | \fBgnunet\-gns-fcfsd\fP runs a web server where users can register names to be mapped to their GNS zone. Names are made available on a First Come First Served basis (hence fcfs). Registered names do not expire. The HTTP server is run on the port that is specified in the configuration file in section "[fcfsd]" under the name "HTTPPORT". The key of the zone in which the names are registered must be specified under the name "ZONEKEY" in the same section. It is possible to manage gnunet\-gns\-fcfsd using gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i fcfsd" or by setting "FORCESTART=YES" in the "fcfds" section of your configuration. | 14 | \fBgnunet\-gns-fcfsd\fP runs a web server where users can register names to be mapped to their GNS zone. Names are made available on a First Come First Served basis (hence fcfs). Registered names do not expire. The HTTP server is run on the port that is specified in the configuration file in section "[fcfsd]" under the name "HTTPPORT". The key of the zone in which the names are registered must be specified under the name "ZONEKEY" in the same section. It is possible to manage gnunet\-gns\-fcfsd using gnunet\-(service\-arm) by starting the daemon using "gnunet\-arm \-i fcfsd" or by setting "FORCESTART=YES" in the "fcfds" section of your configuration. |
15 | 15 | ||
16 | An FCFS\-zone is run at http://gnunet.org/fcfs/. The respective zone key can be imported into an individual user's zone using "gnunet-gns-import.sh". GNS users are encouraged to register their zone with the gnunet.org FCFS authority. | 16 | An FCFS\-zone is run at http://gnunet.org/fcfs/. GNS users are encouraged to register their zone with the gnunet.org FCFS authority. |
17 | 17 | ||
18 | If you want to run your own FCFS registrar, you need to first create a pseudonym (using "gnunet\-identity \-C NAME"), and then assign it to be used for the "fcfsd" service using "gnunet\-identity \-e NAME \-s fcfsd". After that, you can start the FCFSD service (possibly using gnunet\-arm). | 18 | If you want to run your own FCFS registrar, you need to first create a pseudonym (using "gnunet\-identity \-C NAME"), and then assign it to be used for the "fcfsd" service using "gnunet\-identity \-e NAME \-s fcfsd". After that, you can start the FCFSD service (possibly using gnunet\-arm). |
19 | 19 | ||