diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-10-06 20:52:20 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-10-06 20:52:20 +0000 |
commit | 780eb09dd8040ecf8649d40ddf8314464e0fc48e (patch) | |
tree | a0401df2b6bddbd6abf20047703d7e38c91443e1 /src | |
parent | 70921482279e504a61465b760aa13ad55627276a (diff) | |
download | gnunet-780eb09dd8040ecf8649d40ddf8314464e0fc48e.tar.gz gnunet-780eb09dd8040ecf8649d40ddf8314464e0fc48e.zip |
-install fcfsd in libexec, build dv by default, move fcfsd config to namestore.conf.in
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/gns/gns.conf.in | 18 | ||||
-rw-r--r-- | src/namestore/Makefile.am | 12 | ||||
-rw-r--r-- | src/namestore/namestore.conf.in | 13 |
4 files changed, 20 insertions, 25 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 11c964d53..8746a47e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
@@ -12,7 +12,6 @@ endif | |||
12 | 12 | ||
13 | if HAVE_EXPERIMENTAL | 13 | if HAVE_EXPERIMENTAL |
14 | EXP_DIR = \ | 14 | EXP_DIR = \ |
15 | dv \ | ||
16 | multicast \ | 15 | multicast \ |
17 | env \ | 16 | env \ |
18 | psyc \ | 17 | psyc \ |
@@ -69,6 +68,7 @@ SUBDIRS = \ | |||
69 | dns \ | 68 | dns \ |
70 | identity \ | 69 | identity \ |
71 | set \ | 70 | set \ |
71 | dv \ | ||
72 | revocation \ | 72 | revocation \ |
73 | namestore \ | 73 | namestore \ |
74 | vpn \ | 74 | vpn \ |
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in index b96ab7b5d..5529db201 100644 --- a/src/gns/gns.conf.in +++ b/src/gns/gns.conf.in | |||
@@ -32,24 +32,6 @@ PROXY_CACERT = $SERVICEHOME/gns/gnsCAcert.pem | |||
32 | PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock | 32 | PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock |
33 | 33 | ||
34 | 34 | ||
35 | [fcfsd] | ||
36 | # Name of the fcfs binary (for ARM) | ||
37 | BINARY = gnunet-gns-fcfsd | ||
38 | AUTOSTART = NO | ||
39 | |||
40 | # On what port does the FCFS daemon listen for HTTP clients? | ||
41 | HTTPPORT = 18080 | ||
42 | |||
43 | # Where is the zone key for the FCFS zone stored? | ||
44 | ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey | ||
45 | |||
46 | # For ARM, not very useful. FIXME: Dead option? | ||
47 | HOSTNAME = localhost | ||
48 | |||
49 | # FIXME: Dead option? | ||
50 | HOME = $SERVICEHOME | ||
51 | |||
52 | |||
53 | [dns2gns] | 35 | [dns2gns] |
54 | BINARY = gnunet-dns2gns | 36 | BINARY = gnunet-dns2gns |
55 | AUTOSTART = NO | 37 | AUTOSTART = NO |
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am index 07c1ce2f0..f19c9bff9 100644 --- a/src/namestore/Makefile.am +++ b/src/namestore/Makefile.am | |||
@@ -92,7 +92,7 @@ bin_PROGRAMS = \ | |||
92 | gnunet-namestore | 92 | gnunet-namestore |
93 | 93 | ||
94 | if HAVE_MHD | 94 | if HAVE_MHD |
95 | bin_PROGRAMS += \ | 95 | libexec_PROGRAMS += \ |
96 | gnunet-namestore-fcfsd | 96 | gnunet-namestore-fcfsd |
97 | endif | 97 | endif |
98 | 98 | ||
@@ -205,7 +205,7 @@ test_namestore_api_lookup_public_LDADD = \ | |||
205 | $(top_builddir)/src/testing/libgnunettesting.la \ | 205 | $(top_builddir)/src/testing/libgnunettesting.la \ |
206 | $(top_builddir)/src/util/libgnunetutil.la \ | 206 | $(top_builddir)/src/util/libgnunetutil.la \ |
207 | $(top_builddir)/src/namestore/libgnunetnamestore.la | 207 | $(top_builddir)/src/namestore/libgnunetnamestore.la |
208 | 208 | ||
209 | test_namestore_api_put_SOURCES = \ | 209 | test_namestore_api_put_SOURCES = \ |
210 | test_namestore_api_put.c | 210 | test_namestore_api_put.c |
211 | test_namestore_api_put_LDADD = \ | 211 | test_namestore_api_put_LDADD = \ |
@@ -287,11 +287,11 @@ test_plugin_namestore_postgres_SOURCES = \ | |||
287 | test_plugin_namestore_postgres_LDADD = \ | 287 | test_plugin_namestore_postgres_LDADD = \ |
288 | $(top_builddir)/src/testing/libgnunettesting.la \ | 288 | $(top_builddir)/src/testing/libgnunettesting.la \ |
289 | $(top_builddir)/src/util/libgnunetutil.la | 289 | $(top_builddir)/src/util/libgnunetutil.la |
290 | 290 | ||
291 | check_SCRIPTS = \ | 291 | check_SCRIPTS = \ |
292 | test_namestore_put.sh \ | 292 | test_namestore_put.sh \ |
293 | test_namestore_lookup.sh \ | 293 | test_namestore_lookup.sh \ |
294 | test_namestore_delete.sh | 294 | test_namestore_delete.sh |
295 | 295 | ||
296 | EXTRA_DIST = \ | 296 | EXTRA_DIST = \ |
297 | test_namestore_api.conf \ | 297 | test_namestore_api.conf \ |
@@ -304,4 +304,4 @@ EXTRA_DIST = \ | |||
304 | zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \ | 304 | zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \ |
305 | zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \ | 305 | zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \ |
306 | $(check_SCRIPTS) | 306 | $(check_SCRIPTS) |
307 | 307 | ||
diff --git a/src/namestore/namestore.conf.in b/src/namestore/namestore.conf.in index 18a37f0da..2d92f2e7b 100644 --- a/src/namestore/namestore.conf.in +++ b/src/namestore/namestore.conf.in | |||
@@ -21,3 +21,16 @@ TEMPORARY_TABLE = NO | |||
21 | 21 | ||
22 | [uri] | 22 | [uri] |
23 | gns = gnunet-namestore | 23 | gns = gnunet-namestore |
24 | |||
25 | |||
26 | [fcfsd] | ||
27 | # Name of the fcfs registration service binary (for ARM) | ||
28 | BINARY = gnunet-namestore-fcfsd | ||
29 | AUTOSTART = NO | ||
30 | |||
31 | # On what port does the FCFS daemon listen for HTTP clients? | ||
32 | HTTPPORT = 18080 | ||
33 | |||
34 | # Where is the zone key for the FCFS zone stored? | ||
35 | ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey | ||
36 | |||