From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 25 Jan 2013 16:06:56 +0000 (+0000)
Subject: -arminteg
X-Git-Tag: initial-import-from-subversion-38251~10085
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=dce1c030b7461c9ee569ac0bcc3cd68a54cf5a26;p=oweals%2Fgnunet.git

-arminteg
---

diff --git a/src/gns/Makefile.am b/src/gns/Makefile.am
index 3f212eabd..d4fcb6bfe 100644
--- a/src/gns/Makefile.am
+++ b/src/gns/Makefile.am
@@ -54,15 +54,15 @@ endif
 endif
 
 libexec_PROGRAMS = \
-  gnunet-service-gns $(DO_FCFSD)
-
-bin_PROGRAMS = \
+  gnunet-service-gns $(DO_FCFSD) \
   $(DO_PROXY) \
   $(DO_W32_HELPER) \
-  $(DO_W32_NSPTOOLS) \
-  gnunet-gns \
   gnunet-dns2gns
 
+bin_PROGRAMS = \
+  $(DO_W32_NSPTOOLS) \
+  gnunet-gns 
+
 bin_SCRIPTS = gnunet-gns-proxy-setup-ca
 
 plugin_LTLIBRARIES = \
diff --git a/src/gns/gns.conf.in b/src/gns/gns.conf.in
index df5337dff..b4a49de0b 100644
--- a/src/gns/gns.conf.in
+++ b/src/gns/gns.conf.in
@@ -39,11 +39,19 @@ ZONE_PUBLISH_TIME_WINDOW = 4 h
 # PREFIX = valgrind --leak-check=full --track-origins=yes
 
 [gns-proxy]
+BINARY = gnunet-gns-proxy
+AUTOSTART = NO
+
 # Where is the certificate for the GNS proxy stored?
 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
 
@@ -56,11 +64,7 @@ HOSTNAME = localhost
 # FIXME: Dead option?
 HOME = $SERVICEHOME
 
-# Name of the fcfs binary (for ARM)
-BINARY = gnunet-gns-fcfsd
-
 
 [dns2gns]
 BINARY = gnunet-dns2gns
 AUTOSTART = NO
-