cleaned up config

diff --git a/src/hostlist/test_learning_adv_peer.conf b/src/hostlist/test_learning_adv_peer.conf
index b1d2632441ca4d8d17d4ee94072f5189c9d26971..9a364b0abcf211cd9901549bc776148c390e0791 100644 (file)
--- a/src/hostlist/test_learning_adv_peer.conf
+++ b/src/hostlist/test_learning_adv_peer.conf
@@ -1,26 +1,27 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-2/
+SERVICEHOME = /tmp/test-hostlist-peer-2/
+DEFAULTCONFIG = test_learning_adv_peer.conf
 
 [resolver]
 PORT = 22964
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+UNIXPATH = /tmp/gnunet-hostlist-p2-service-resolver.sock
 
 [transport]
 PORT = 22965
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
+UNIXPATH = /tmp/gnunet-hostlist-p2-service-transport.sock
 PLUGINS = tcp
 #DEBUG = YES
 
 [arm]
 PORT = 22966
-UNIXPATH = /tmp/gnunet-p1-service-arm.sock
+UNIXPATH = /tmp/gnunet-hostlist-p2-service-arm.sock
 DEFAULTSERVICES = topology hostlist
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args
 DEBUG=YES
 
 [statistics]
 PORT = 22967
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
+UNIXPATH = /tmp/gnunet-hostlist-p2-service-statistics.sock
 HOSTNAME = localhost
 
 [transport-tcp]
@@ -28,11 +29,11 @@ PORT = 22968
 
 [peerinfo]
 PORT = 22969
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
+UNIXPATH = /tmp/gnunet-hostlist-p2-service-peerinfo.sock
 
 [core]
 PORT = 22970
-UNIXPATH = /tmp/gnunet-p1-service-core.sock
+UNIXPATH = /tmp/gnunet-hostlist-p2-service-core.sock
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck
 
@@ -47,7 +48,6 @@ OPTIONS = -p -a
 #OPTIONS = -b -p -a
 #DEBUG = YES
 HOSTLISTFILE = hostlists_adv_peer.file
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
 
 [topology]
 #DEBUG = YES

diff --git a/src/hostlist/test_learning_learn_peer.conf b/src/hostlist/test_learning_learn_peer.conf
index e871c609cd3efe374ac36db72c5d15940a432508..c2d02e1d36e57d4bc8ae0e55afd55874e04c61ee 100644 (file)
--- a/src/hostlist/test_learning_learn_peer.conf
+++ b/src/hostlist/test_learning_learn_peer.conf
@@ -1,27 +1,27 @@
 [PATHS]
-SERVICEHOME = /tmp/test-gnunetd-hostlist-peer-1/
+SERVICEHOME = /tmp/test-hostlist-peer-1/
 DEFAULTCONFIG = test_learning_learn_peer.conf
 
 [resolver]
 PORT = 12964
-UNIXPATH = /tmp/gnunet-p2-service-resolver.sock
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-resolver.sock
 
 [transport]
 PORT = 12965
-UNIXPATH = /tmp/gnunet-p2-service-transport.sock
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-transport.sock
 PLUGINS = tcp
 #DEBUG = YES
 
 [arm]
 PORT = 12966
-UNIXPATH = /tmp/gnunet-p2-service-arm.sock
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-arm.sock
 DEFAULTSERVICES = topology hostlist
 #GLOBAL_PREFIX = xterm -e gdb -x cmd --args 
 #DEBUG=YES
 
 [statistics]
 PORT = 12967
-UNIXPATH = /tmp/gnunet-p2-service-statistics.sock
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-statistics.sock
 HOSTNAME = localhost
 
 [transport-tcp]
@@ -29,12 +29,12 @@ PORT = 12968
 
 [peerinfo]
 PORT = 12969
-UNIXPATH = /tmp/gnunet-p2-service-peerinfo.sock
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-peerinfo.sock
 
 
 [core]
 PORT = 12970
-UNIXPATH = /tmp/gnunet-p2-service-core.sock
+UNIXPATH = /tmp/gnunet-hostlist-p1-service-core.sock
 #DEBUG = YES
 #PREFIX = valgrind --tool=memcheck
 
@@ -48,8 +48,6 @@ OPTIONS = -b -e
 #OPTIONS = -b -p
 #DEBUG = YES
 HOSTLISTFILE = hostlists_learn_peer.file
-#BINARY = /home/grothoff/bin/gnunet-daemon-hostlist
-
 
 [topology]
 #DEBUG = YES