simplifying config

author: Christian Grothoff <christian@grothoff.org> 2011-08-01 13:35:31 +0000
committer: Christian Grothoff <christian@grothoff.org> 2011-08-01 13:35:31 +0000
commit: 0ea2ffb99da4645d3984fd0b207bd78d261e8356 (patch)
tree: 903b2f7de0204a116d5714a7aae84405dc51b68c /src/transport/test_transport_api_wlan_peer1.conf
parent: 8b75d8b9e863d4c1e3bb21df93897bca6b9d1799 (diff)
download: gnunet-0ea2ffb99da4645d3984fd0b207bd78d261e8356.tar.gz
gnunet-0ea2ffb99da4645d3984fd0b207bd78d261e8356.zip
1 files changed, 17 insertions, 108 deletions
diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf
index 2bcaa6cd8..704fd55b1 100644
--- a/src/transport/test_transport_api_wlan_peer1.conf
+++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -1,121 +1,30 @@
-[fs]
+@INLINE@ test_transport_defaults.conf
-AUTOSTART = NO
+[PATHS]
+SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-[datastore]
+DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
-AUTOSTART = NO
-[core]
-AUTOSTART = NO
 [transport-wlan]
-INTERFACE = mon0
 TESTMODE = 1
-#PREFIX = gdbserver :2345
-[hostlist]
-HTTP-PROXY = 
-SERVERS = http://gnunet.org:8080/
-OPTIONS = -b
-BINARY = gnunet-daemon-hostlist
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-HTTPPORT = 8080
-[topology]
-BINARY = gnunet-daemon-topology
-CONFIG = $DEFAULTCONFIG
-FRIENDS = $SERVICEHOME/friends
-TARGET-CONNECTION-COUNT = 16
-AUTOCONNECT = YES
-FRIENDS-ONLY = NO
-MINIMUM-FRIENDS = 0
-[transport]
-PLUGINS = wlan
-#DEBUG=YES
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-NEIGHBOUR_LIMIT = 50
-BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12160
-UNIXPATH = /tmp/gnunet-p1-service-transport.sock
-#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
-#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
-#PREFIX = valgrind --leak-check=full --show-reachable=yes
-#PREFIX = valgrind --leak-check=full
-#PREFIX = valgrind --tool=massif
-#PREFIX = gdbserver :2345
-[peerinfo]
-TRUST = $SERVICEHOME/data/credit/
-HOSTS = $SERVICEHOME/data/hosts/
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-peerinfo
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12161
-UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-[resolver]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-resolver
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12162
-UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
-[statistics]
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-statistics
-CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
-PORT = 12163
-UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
 [arm]
-DEFAULTSERVICES = 
-ACCEPT_FROM6 = ::1;
-ACCEPT_FROM = 127.0.0.1;
-BINARY = gnunet-service-arm
-#CONFIG = $DEFAULTCONFIG
-HOME = $SERVICEHOME
-HOSTNAME = localhost
 PORT = 12164
 UNIXPATH = /tmp/gnunet-p1-service-arm.sock
-[TESTING]
+[statistics]
-WEAKRANDOM = YES
+PORT = 12163
+UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-[PATHS]
-SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-[dht]
-AUTOSTART = NO
-[mesh]
-AUTOSTART = NO
-[dns]
-AUTOSTART = NO
+[resolver]
+PORT = 12162
+UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
+[peerinfo]
+PORT = 12161
+UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
-[nse]
+[transport]
-AUTOSTART = NO
+PORT = 12160
+PLUGINS = wlan
+UNIXPATH = /tmp/gnunet-p1-service-transport.sock
author	Christian Grothoff <christian@grothoff.org>	2011-08-01 13:35:31 +0000
committer	Christian Grothoff <christian@grothoff.org>	2011-08-01 13:35:31 +0000
commit	0ea2ffb99da4645d3984fd0b207bd78d261e8356 (patch)
tree	903b2f7de0204a116d5714a7aae84405dc51b68c /src/transport/test_transport_api_wlan_peer1.conf
parent	8b75d8b9e863d4c1e3bb21df93897bca6b9d1799 (diff)
download	gnunet-0ea2ffb99da4645d3984fd0b207bd78d261e8356.tar.gz gnunet-0ea2ffb99da4645d3984fd0b207bd78d261e8356.zip

diff --git a/src/transport/test_transport_api_wlan_peer1.conf b/src/transport/test_transport_api_wlan_peer1.conf index 2bcaa6cd8..704fd55b1 100644 --- a/src/transport/test_transport_api_wlan_peer1.conf +++ b/src/transport/test_transport_api_wlan_peer1.conf
@@ -1,121 +1,30 @@
1	[fs]	1	@INLINE@ test_transport_defaults.conf
2	AUTOSTART = NO	2	[PATHS]
3		3	SERVICEHOME = /tmp/test-transport/api-wlan-p1/
4	[datastore]	4	DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
5	AUTOSTART = NO
6
7	[core]
8	AUTOSTART = NO
9		5
10	[transport-wlan]	6	[transport-wlan]
11	INTERFACE = mon0
12	TESTMODE = 1	7	TESTMODE = 1
13	#PREFIX = gdbserver :2345
14
15	[hostlist]
16	HTTP-PROXY =
17	SERVERS = http://gnunet.org:8080/
18	OPTIONS = -b
19	BINARY = gnunet-daemon-hostlist
20	CONFIG = $DEFAULTCONFIG
21	HOME = $SERVICEHOME
22	HOSTNAME = localhost
23	HTTPPORT = 8080
24
25	[topology]
26	BINARY = gnunet-daemon-topology
27	CONFIG = $DEFAULTCONFIG
28	FRIENDS = $SERVICEHOME/friends
29	TARGET-CONNECTION-COUNT = 16
30	AUTOCONNECT = YES
31	FRIENDS-ONLY = NO
32	MINIMUM-FRIENDS = 0
33
34	[transport]
35	PLUGINS = wlan
36	#DEBUG=YES
37	ACCEPT_FROM6 = ::1;
38	ACCEPT_FROM = 127.0.0.1;
39	NEIGHBOUR_LIMIT = 50
40	BINARY = gnunet-service-transport
41	CONFIG = $DEFAULTCONFIG
42	HOME = $SERVICEHOME
43	HOSTNAME = localhost
44	PORT = 12160
45	UNIXPATH = /tmp/gnunet-p1-service-transport.sock
46	#PREFIX = xterm -T transport2 -e gdb --command=cmd --args
47	#PREFIX = valgrind --leak-check=full --show-reachable=yes --main-stacksize=104857600
48	#PREFIX = valgrind --leak-check=full --show-reachable=yes
49	#PREFIX = valgrind --leak-check=full
50	#PREFIX = valgrind --tool=massif
51	#PREFIX = gdbserver :2345
52
53	[peerinfo]
54	TRUST = $SERVICEHOME/data/credit/
55	HOSTS = $SERVICEHOME/data/hosts/
56	ACCEPT_FROM6 = ::1;
57	ACCEPT_FROM = 127.0.0.1;
58	BINARY = gnunet-service-peerinfo
59	CONFIG = $DEFAULTCONFIG
60	HOME = $SERVICEHOME
61	HOSTNAME = localhost
62	PORT = 12161
63	UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
64
65	[resolver]
66	ACCEPT_FROM6 = ::1;
67	ACCEPT_FROM = 127.0.0.1;
68	BINARY = gnunet-service-resolver
69	CONFIG = $DEFAULTCONFIG
70	HOME = $SERVICEHOME
71	HOSTNAME = localhost
72	PORT = 12162
73	UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
74
75	[statistics]
76	ACCEPT_FROM6 = ::1;
77	ACCEPT_FROM = 127.0.0.1;
78	BINARY = gnunet-service-statistics
79	CONFIG = $DEFAULTCONFIG
80	HOME = $SERVICEHOME
81	HOSTNAME = localhost
82	PORT = 12163
83	UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
84		8
85	[arm]	9	[arm]
86	DEFAULTSERVICES =
87	ACCEPT_FROM6 = ::1;
88	ACCEPT_FROM = 127.0.0.1;
89	BINARY = gnunet-service-arm
90	#CONFIG = $DEFAULTCONFIG
91	HOME = $SERVICEHOME
92	HOSTNAME = localhost
93	PORT = 12164	10	PORT = 12164
94	UNIXPATH = /tmp/gnunet-p1-service-arm.sock	11	UNIXPATH = /tmp/gnunet-p1-service-arm.sock
95		12
96	[TESTING]	13	[statistics]
97	WEAKRANDOM = YES	14	PORT = 12163
98		15	UNIXPATH = /tmp/gnunet-p1-service-statistics.sock
99	[gnunetd]
100	HOSTKEY = $SERVICEHOME/.hostkey
101
102	[PATHS]
103	SERVICEHOME = /tmp/test-transport/api-wlan-p1/
104
105
106	[dht]
107	AUTOSTART = NO
108
109	[mesh]
110	AUTOSTART = NO
111
112
113	[dns]
114	AUTOSTART = NO
115		16
		17	[resolver]
		18	PORT = 12162
		19	UNIXPATH = /tmp/gnunet-p1-service-resolver.sock
116		20
		21	[peerinfo]
		22	PORT = 12161
		23	UNIXPATH = /tmp/gnunet-p1-service-peerinfo.sock
117		24
118	[nse]	25	[transport]
119	AUTOSTART = NO	26	PORT = 12160
		27	PLUGINS = wlan
		28	UNIXPATH = /tmp/gnunet-p1-service-transport.sock
120		29
121		30