-install fcfsd in libexec, build dv by default, move fcfsd config to namestore.conf.in

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
 
 if HAVE_EXPERIMENTAL
  EXP_DIR = \
-  dv \
   multicast \
   env \
   psyc \
@@ -69,6 +68,7 @@ SUBDIRS = \
   dns \
   identity \
   set \
+  dv \
   revocation \
   namestore \
   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
 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
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 = \
  gnunet-namestore 
 
 if HAVE_MHD
-bin_PROGRAMS += \
+libexec_PROGRAMS += \
  gnunet-namestore-fcfsd
 endif
 
@@ -205,7 +205,7 @@ test_namestore_api_lookup_public_LDADD = \
   $(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_SOURCES = \
 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 @@ EXTRA_DIST = \
   zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \
   zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \
   $(check_SCRIPTS)
-   
+
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
 
 [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
+