diff options
-rw-r--r-- | README | 50 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/include/gnunet_namestore_service.h | 5 |
3 files changed, 35 insertions, 21 deletions
@@ -67,30 +67,38 @@ If you install from source, you need to install GNU libextractor first | |||
67 | (download from http://www.gnu.org/software/libextractor/). We also | 67 | (download from http://www.gnu.org/software/libextractor/). We also |
68 | recommend installing GNU libmicrohttpd (download from | 68 | recommend installing GNU libmicrohttpd (download from |
69 | http://www.gnu.org/software/libmicrohttpd/). Then you can start the | 69 | http://www.gnu.org/software/libmicrohttpd/). Then you can start the |
70 | actual GNUnet compilation process with: | 70 | actual GNUnet compilation and installation process with: |
71 | 71 | ||
72 | $ ./configure --prefix=$HOME --with-extractor=$HOME | 72 | $ export GNUNET_PREFIX=/usr/local # or other directory of your choice |
73 | $ addgroup gnunetdns | ||
74 | $ adduser gnunet gnunet | ||
75 | $ ./configure --prefix=$GNUNET_PREFIX --with-extractor=$LE_PREFIX | ||
73 | $ make | 76 | $ make |
74 | # make install | 77 | # make install |
75 | # sudo -u gnunet mkdir ~/.gnunet/ | 78 | # sudo -u gnunet mkdir ~/.gnunet/ |
76 | # sudo -u gnunet touch ~/.gnunet/gnunet.conf | 79 | # sudo -u gnunet touch ~/.gnunet/gnunet.conf |
77 | # sudo -u gnunet gnunet-arm -s | 80 | # sudo -u gnunet gnunet-arm -s |
78 | 81 | ||
79 | This will compile and install GNUnet to $HOME/bin/, $HOME/lib/ and | 82 | This will create the users and groups needed for running GNUnet |
80 | $HOME/share/ and start the system with the default configuration. It | 83 | securely and then compile and install GNUnet to $GNUNET_PREFIX/bin/, |
81 | is recommended that you add a user "gnunet" to run "gnunet-arm". You | 84 | $GNUNET_PREFIX/lib/ and $GNUNET_PREFIX/share/ and start the system |
82 | can then still run the end-user applications as another user. If you | 85 | with the default configuration. It is strongly recommended that you |
83 | create a user "gnunet", it is recommended that you edit the | 86 | add a user "gnunet" to run "gnunet-arm". You can then still run the |
84 | configuration file slightly so that data can be stored in | 87 | end-user applications as another user. |
85 | "/var/lib/gnunet"; you may also want to use "/etc/gnunet.conf" for the | 88 | |
86 | location of the configuration file in this case. | 89 | If you create a system user "gnunet", it is recommended that you edit |
90 | the configuration file slightly so that data can be stored in the | ||
91 | system user home directory at "/var/lib/gnunet"; you may also want to | ||
92 | use "/etc/gnunet.conf" for the location of the configuration file in | ||
93 | this case. | ||
87 | 94 | ||
88 | You can avoid running 'make install' as root if you run configure | 95 | You can avoid running 'make install' as root if you run configure |
89 | with the "--with-sudo=yes" option and have extensive sudo rights | 96 | with the "--with-sudo=yes" option and have extensive sudo rights |
90 | (can run chmod +s and chown via sudo). If you run 'make install' | 97 | (can run "chmod +s" and "chown" via 'sudo'). If you run 'make install' |
91 | as a normal user without sudo rights (or the configure option), | 98 | as a normal user without sudo rights (or the configure option), |
92 | certain binaries that require additional priviledges will not be | 99 | certain binaries that require additional priviledges will not be |
93 | installed properly (and NAT traversal, WLAN and VPN will not work). | 100 | installed properly (and autonomous NAT traversal, WLAN, DNS/GNS and |
101 | the VPN will then not work). | ||
94 | 102 | ||
95 | Note that additional, per-user configuration files | 103 | Note that additional, per-user configuration files |
96 | (~/.gnunet/gnunet.conf) need to be created by each user (for example, | 104 | (~/.gnunet/gnunet.conf) need to be created by each user (for example, |
@@ -113,12 +121,12 @@ Configuration | |||
113 | ============= | 121 | ============= |
114 | 122 | ||
115 | GNUnet uses two types of configuration files, one that specifies the | 123 | GNUnet uses two types of configuration files, one that specifies the |
116 | system-wide defaults (typically located in /usr/share/gnunet/defaults | 124 | system-wide defaults (typically located in |
117 | .conf) and a second one that overrides default values with | 125 | $GNUNET_PREFIX/share/gnunet/config.d/) and a second one that overrides |
118 | user-specific preferences. The user-specific configuration file | 126 | default values with user-specific preferences. The user-specific |
119 | should be located in "~/.gnunet/gnunet.conf" or its location can be | 127 | configuration file should be located in "~/.gnunet/gnunet.conf" or its |
120 | specified by giving the "-c" option to the respective GNUnet | 128 | location can be specified by giving the "-c" option to the respective |
121 | application. | 129 | GNUnet application. |
122 | 130 | ||
123 | The defaults that are shipped with the installation are usually ok, | 131 | The defaults that are shipped with the installation are usually ok, |
124 | you may want to adjust the limitations (space consumption, bandwidth, | 132 | you may want to adjust the limitations (space consumption, bandwidth, |
@@ -168,9 +176,11 @@ together with a description. To publish files on GNUnet, use the | |||
168 | 176 | ||
169 | 177 | ||
170 | The GTK user interface is shipped separately. After downloading and | 178 | The GTK user interface is shipped separately. After downloading and |
171 | installing gnunet-gtk, you can invoke the GUI with: | 179 | installing gnunet-gtk, you can invoke the setup tool and the |
180 | file-sharing GUI with: | ||
172 | 181 | ||
173 | $ gnunet-gtk | 182 | $ gnunet-setup |
183 | $ gnunet-fs-gtk | ||
174 | 184 | ||
175 | For further documentation, see our webpage. | 185 | For further documentation, see our webpage. |
176 | 186 | ||
diff --git a/configure.ac b/configure.ac index b1073d9d6..46a548cc9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -871,6 +871,7 @@ src/exit/Makefile | |||
871 | src/fragmentation/Makefile | 871 | src/fragmentation/Makefile |
872 | src/fs/Makefile | 872 | src/fs/Makefile |
873 | src/fs/fs.conf | 873 | src/fs/fs.conf |
874 | src/gns/Makefile | ||
874 | src/hello/Makefile | 875 | src/hello/Makefile |
875 | src/include/Makefile | 876 | src/include/Makefile |
876 | src/include/gnunet_directories.h | 877 | src/include/gnunet_directories.h |
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index 51079fec8..dac21fbee 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h | |||
@@ -260,7 +260,10 @@ GNUNET_NAMESTORE_record_remove (struct GNUNET_NAMESTORE_Handle *h, | |||
260 | * @param cls closure | 260 | * @param cls closure |
261 | * @param zone_key public key of the zone | 261 | * @param zone_key public key of the zone |
262 | * @param expire when does the corresponding block in the DHT expire (until | 262 | * @param expire when does the corresponding block in the DHT expire (until |
263 | * when should we never do a DHT lookup for the same name again)? | 263 | * when should we never do a DHT lookup for the same name again)?; |
264 | * GNUNET_TIME_UNIT_ZERO_ABS if there are no records of any type in the namestore, | ||
265 | * or the expiration time of the block in the namestore (even if there are zero | ||
266 | * records matching the desired record type) | ||
264 | * @param name name that is being mapped (at most 255 characters long) | 267 | * @param name name that is being mapped (at most 255 characters long) |
265 | * @param rd_count number of entries in 'rd' array | 268 | * @param rd_count number of entries in 'rd' array |
266 | * @param rd array of records with data to store | 269 | * @param rd array of records with data to store |