[GNUnet-SVN] r29904 - in gnunet/src: . gns namestore

[gnunet]

Author: grothoff
Date: 2013-10-06 22:52:20 +0200 (Sun, 06 Oct 2013)
New Revision: 29904

Modified:
   gnunet/src/Makefile.am
   gnunet/src/gns/gns.conf.in
   gnunet/src/namestore/Makefile.am
   gnunet/src/namestore/namestore.conf.in
Log:
-install fcfsd in libexec, build dv by default, move fcfsd config to 
namestore.conf.in

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2013-10-06 20:44:45 UTC (rev 29903)
+++ gnunet/src/Makefile.am      2013-10-06 20:52:20 UTC (rev 29904)
@@ -12,7 +12,6 @@
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
   multicast \
   env \
   psyc \
@@ -69,6 +68,7 @@
   dns \
   identity \
   set \
+  dv \
   revocation \
   namestore \
   vpn \

Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in  2013-10-06 20:44:45 UTC (rev 29903)
+++ gnunet/src/gns/gns.conf.in  2013-10-06 20:52:20 UTC (rev 29904)
@@ -32,24 +32,6 @@
 PROXY_UNIXPATH = /tmp/gnunet-gns-proxy.sock
 
 
-[fcfsd]
-# Name of the fcfs binary (for ARM)
-BINARY = gnunet-gns-fcfsd
-AUTOSTART = NO
-
-# On what port does the FCFS daemon listen for HTTP clients?
-HTTPPORT = 18080
-
-# Where is the zone key for the FCFS zone stored?
-ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey
-
-# For ARM, not very useful.  FIXME: Dead option?
-HOSTNAME = localhost
-
-# FIXME: Dead option?
-HOME = $SERVICEHOME
-
-
 [dns2gns]
 BINARY = gnunet-dns2gns
 AUTOSTART = NO

Modified: gnunet/src/namestore/Makefile.am
===================================================================
--- gnunet/src/namestore/Makefile.am    2013-10-06 20:44:45 UTC (rev 29903)
+++ gnunet/src/namestore/Makefile.am    2013-10-06 20:52:20 UTC (rev 29904)
@@ -92,7 +92,7 @@
  gnunet-namestore 
 
 if HAVE_MHD
-bin_PROGRAMS += \
+libexec_PROGRAMS += \
  gnunet-namestore-fcfsd
 endif
 
@@ -205,7 +205,7 @@
   $(top_builddir)/src/testing/libgnunettesting.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la
-  
+
 test_namestore_api_put_SOURCES = \
  test_namestore_api_put.c
 test_namestore_api_put_LDADD = \
@@ -287,11 +287,11 @@
 test_plugin_namestore_postgres_LDADD = \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(top_builddir)/src/util/libgnunetutil.la
- 
+
 check_SCRIPTS = \
        test_namestore_put.sh \
-       test_namestore_lookup.sh \
-       test_namestore_delete.sh 
+       test_namestore_lookup.sh \
+       test_namestore_delete.sh 
 
 EXTRA_DIST = \
   test_namestore_api.conf \
@@ -304,4 +304,4 @@
   zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \
   zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \
   $(check_SCRIPTS)
-   
+

Modified: gnunet/src/namestore/namestore.conf.in
===================================================================
--- gnunet/src/namestore/namestore.conf.in      2013-10-06 20:44:45 UTC (rev 
29903)
+++ gnunet/src/namestore/namestore.conf.in      2013-10-06 20:52:20 UTC (rev 
29904)
@@ -21,3 +21,16 @@
 
 [uri]
 gns = gnunet-namestore
+
+
+[fcfsd]
+# Name of the fcfs registration service binary (for ARM)
+BINARY = gnunet-namestore-fcfsd
+AUTOSTART = NO
+
+# On what port does the FCFS daemon listen for HTTP clients?
+HTTPPORT = 18080
+
+# Where is the zone key for the FCFS zone stored?
+ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey
+