[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24237 - in gnunet/src: arm ats ats-test chat core datastor
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r24237 - in gnunet/src: arm ats ats-test chat core datastore dht dns dv exit fs gns hostlist integration-tests/confs lockmanager mesh namestore nat nse peerinfo pt regex statistics stream template testbed testing testing_old topology transport util vpn |
|
Date: |
Tue, 9 Oct 2012 20:38:01 +0200 |
Author: grothoff
Date: 2012-10-09 20:38:01 +0200 (Tue, 09 Oct 2012)
New Revision: 24237
Modified:
gnunet/src/arm/arm.conf.in
gnunet/src/arm/test_arm_api_data.conf
gnunet/src/ats-test/test_transport_ats_1addr.conf
gnunet/src/ats-test/test_transport_ats_2addr.conf
gnunet/src/ats-test/test_transport_ats_4addr.conf
gnunet/src/ats/ats.conf.in
gnunet/src/ats/test_ats_api.conf
gnunet/src/chat/chat.conf.in
gnunet/src/chat/test_chat_data.conf
gnunet/src/chat/test_chat_peer1.conf
gnunet/src/chat/test_chat_peer2.conf
gnunet/src/chat/test_chat_peer3.conf
gnunet/src/core/core.conf.in
gnunet/src/core/test_core_api_data.conf
gnunet/src/core/test_core_api_peer1.conf
gnunet/src/core/test_core_api_peer2.conf
gnunet/src/core/test_core_api_send_to_self.conf
gnunet/src/core/test_core_defaults.conf
gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
gnunet/src/core/test_core_quota_peer1.conf
gnunet/src/core/test_core_quota_peer2.conf
gnunet/src/datastore/datastore.conf.in
gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf
gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf
gnunet/src/datastore/test_datastore_api_data_mysql.conf
gnunet/src/datastore/test_datastore_api_data_postgres.conf
gnunet/src/datastore/test_datastore_api_data_sqlite.conf
gnunet/src/datastore/test_plugin_datastore_data_mysql.conf
gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf
gnunet/src/dht/dht.conf.in
gnunet/src/dht/test_dht_2dtorus.conf
gnunet/src/dht/test_dht_api_data.conf
gnunet/src/dht/test_dht_api_peer1.conf
gnunet/src/dht/test_dht_line.conf
gnunet/src/dht/test_dht_multipeer_data.conf
gnunet/src/dht/test_dht_twopeer_data.conf
gnunet/src/dns/dns.conf.in
gnunet/src/dv/dv.conf.in
gnunet/src/dv/test_transport_dv_data.conf
gnunet/src/exit/exit.conf
gnunet/src/fs/fs.conf.in
gnunet/src/fs/test_fs_data.conf
gnunet/src/fs/test_fs_defaults.conf
gnunet/src/fs/test_fs_download_data.conf
gnunet/src/fs/test_fs_file_information_data.conf
gnunet/src/fs/test_fs_list_indexed_data.conf
gnunet/src/fs/test_fs_namespace_data.conf
gnunet/src/fs/test_fs_publish_data.conf
gnunet/src/fs/test_fs_search_data.conf
gnunet/src/fs/test_fs_unindex_data.conf
gnunet/src/fs/test_gnunet_fs_idx_data.conf
gnunet/src/fs/test_gnunet_fs_ns_data.conf
gnunet/src/fs/test_gnunet_fs_psd_data.conf
gnunet/src/fs/test_gnunet_fs_rec_data.conf
gnunet/src/fs/test_gnunet_service_fs_migration_data.conf
gnunet/src/gns/gns-helper-service-w32.conf
gnunet/src/gns/gns.conf.in
gnunet/src/gns/test_gns_dht_default.conf
gnunet/src/gns/test_gns_proxy.conf
gnunet/src/gns/test_gns_simple_lookup.conf
gnunet/src/hostlist/hostlist.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
gnunet/src/hostlist/test_hostlist_defaults.conf
gnunet/src/hostlist/test_learning_adv_peer.conf
gnunet/src/hostlist/test_learning_learn_peer.conf
gnunet/src/hostlist/test_learning_learn_peer2.conf
gnunet/src/integration-tests/confs/c_bootstrap_server.conf
gnunet/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
gnunet/src/integration-tests/confs/c_nat_client.conf
gnunet/src/integration-tests/confs/c_no_nat_client.conf
gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
gnunet/src/lockmanager/lockmanager.conf.in
gnunet/src/lockmanager/test_lockmanager_api.conf
gnunet/src/mesh/mesh.conf.in
gnunet/src/mesh/test_mesh.conf
gnunet/src/mesh/test_mesh_2dtorus.conf
gnunet/src/mesh/test_mesh_path.conf
gnunet/src/mesh/test_mesh_small.conf
gnunet/src/namestore/namestore.conf.in
gnunet/src/namestore/test_namestore_api.conf
gnunet/src/nat/test_nat_data.conf
gnunet/src/nat/test_nat_test_data.conf
gnunet/src/nse/nse.conf.in
gnunet/src/nse/nse_profiler_test.conf
gnunet/src/nse/test_nse.conf
gnunet/src/peerinfo/peerinfo.conf.in
gnunet/src/pt/pt.conf
gnunet/src/pt/test_gns_vpn.conf
gnunet/src/pt/test_gnunet_vpn.conf
gnunet/src/regex/test_regex_big.conf
gnunet/src/statistics/statistics.conf.in
gnunet/src/statistics/test_statistics_api_data.conf
gnunet/src/stream/test_stream_local.conf
gnunet/src/template/template.conf
gnunet/src/testbed/test_testbed_api.conf
gnunet/src/testbed/testbed.conf.in
gnunet/src/testing/test_testing_defaults.conf
gnunet/src/testing_old/test_testing_2dtorus.conf
gnunet/src/testing_old/test_testing_connect_peer1.conf
gnunet/src/testing_old/test_testing_connect_peer2.conf
gnunet/src/testing_old/test_testing_data.conf
gnunet/src/testing_old/test_testing_data_remote.conf
gnunet/src/testing_old/test_testing_data_topology_2d_torus.conf
gnunet/src/testing_old/test_testing_data_topology_blacklist.conf
gnunet/src/testing_old/test_testing_data_topology_churn.conf
gnunet/src/testing_old/test_testing_data_topology_clique.conf
gnunet/src/testing_old/test_testing_data_topology_clique_dfs.conf
gnunet/src/testing_old/test_testing_data_topology_clique_minimum.conf
gnunet/src/testing_old/test_testing_data_topology_clique_random.conf
gnunet/src/testing_old/test_testing_data_topology_erdos_renyi.conf
gnunet/src/testing_old/test_testing_data_topology_internat.conf
gnunet/src/testing_old/test_testing_data_topology_none.conf
gnunet/src/testing_old/test_testing_data_topology_ring.conf
gnunet/src/testing_old/test_testing_data_topology_scale_free.conf
gnunet/src/testing_old/test_testing_data_topology_small_world_ring.conf
gnunet/src/testing_old/test_testing_data_topology_small_world_torus.conf
gnunet/src/testing_old/test_testing_data_topology_stability.conf
gnunet/src/testing_old/test_testing_defaults.conf
gnunet/src/testing_old/test_testing_peergroup_data.conf
gnunet/src/topology/topology.conf
gnunet/src/transport/template_cfg_peer1.conf
gnunet/src/transport/template_cfg_peer2.conf
gnunet/src/transport/test_plugin_transport_data.conf
gnunet/src/transport/test_quota_compliance_data.conf
gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_http_peer1.conf
gnunet/src/transport/test_quota_compliance_http_peer2.conf
gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_https_peer1.conf
gnunet/src/transport/test_quota_compliance_https_peer2.conf
gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
gnunet/src/transport/test_quota_compliance_udp_peer1.conf
gnunet/src/transport/test_quota_compliance_udp_peer2.conf
gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_unix_peer1.conf
gnunet/src/transport/test_quota_compliance_unix_peer2.conf
gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
gnunet/src/transport/test_quota_compliance_wlan_peer1.conf
gnunet/src/transport/test_quota_compliance_wlan_peer2.conf
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
gnunet/src/transport/test_transport_api_data.conf
gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
gnunet/src/transport/test_transport_api_http_peer1.conf
gnunet/src/transport/test_transport_api_http_peer2.conf
gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
gnunet/src/transport/test_transport_api_https_peer1.conf
gnunet/src/transport/test_transport_api_https_peer2.conf
gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
gnunet/src/transport/test_transport_api_multi_peer1.conf
gnunet/src/transport/test_transport_api_multi_peer2.conf
gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
gnunet/src/transport/test_transport_api_tcp_peer1.conf
gnunet/src/transport/test_transport_api_tcp_peer2.conf
gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
gnunet/src/transport/test_transport_api_udp_peer1.conf
gnunet/src/transport/test_transport_api_udp_peer2.conf
gnunet/src/transport/test_transport_api_unix_peer1.conf
gnunet/src/transport/test_transport_api_unix_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
gnunet/src/transport/test_transport_api_wlan_peer1.conf
gnunet/src/transport/test_transport_api_wlan_peer2.conf
gnunet/src/transport/test_transport_defaults.conf
gnunet/src/transport/test_transport_startonly.conf
gnunet/src/transport/transport.conf.in
gnunet/src/util/resolver.conf.in
gnunet/src/util/util.conf
gnunet/src/vpn/vpn.conf.in
Log:
-getting rid of silly, stupid, useless, often wrong DEFAULTCONFIG setting
Modified: gnunet/src/arm/arm.conf.in
===================================================================
--- gnunet/src/arm/arm.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/arm/arm.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 2087
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/arm/test_arm_api_data.conf
===================================================================
--- gnunet/src/arm/test_arm_api_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/arm/test_arm_api_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-arm/
-DEFAULTCONFIG = test_arm_api_data.conf
[arm]
PORT = 23354
@@ -21,7 +20,6 @@
PORT = 2223
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = mockup-service
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/ats/ats.conf.in
===================================================================
--- gnunet/src/ats/ats.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/ats/ats.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 2098
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/ats/test_ats_api.conf
===================================================================
--- gnunet/src/ats/test_ats_api.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/ats/test_ats_api.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -13,7 +13,6 @@
PORT = 12002
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/ats-test/test_transport_ats_1addr.conf
===================================================================
--- gnunet/src/ats-test/test_transport_ats_1addr.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/ats-test/test_transport_ats_1addr.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_data.conf
[TESTING]
HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
Modified: gnunet/src/ats-test/test_transport_ats_2addr.conf
===================================================================
--- gnunet/src/ats-test/test_transport_ats_2addr.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/ats-test/test_transport_ats_2addr.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_data.conf
[TESTING]
HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
Modified: gnunet/src/ats-test/test_transport_ats_4addr.conf
===================================================================
--- gnunet/src/ats-test/test_transport_ats_4addr.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/ats-test/test_transport_ats_4addr.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_data.conf
[TESTING]
HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
Modified: gnunet/src/chat/chat.conf.in
===================================================================
--- gnunet/src/chat/chat.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/chat/chat.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 2090
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/chat/test_chat_data.conf
===================================================================
--- gnunet/src/chat/test_chat_data.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/chat/test_chat_data.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-chat/
-DEFAULTCONFIG = test_chat_data.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
@@ -30,7 +29,6 @@
PORT = 42471
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
[testing]
Modified: gnunet/src/chat/test_chat_peer1.conf
===================================================================
--- gnunet/src/chat/test_chat_peer1.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/chat/test_chat_peer1.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-chat-peer-1/
-DEFAULTCONFIG = test_chat_peer1.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[peerinfo]
@@ -58,7 +56,6 @@
PORT = 31008
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
[testing]
Modified: gnunet/src/chat/test_chat_peer2.conf
===================================================================
--- gnunet/src/chat/test_chat_peer2.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/chat/test_chat_peer2.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-chat-peer-2/
-DEFAULTCONFIG = test_chat_peer2.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[peerinfo]
@@ -58,7 +56,6 @@
PORT = 32008
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
[testing]
Modified: gnunet/src/chat/test_chat_peer3.conf
===================================================================
--- gnunet/src/chat/test_chat_peer3.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/chat/test_chat_peer3.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-chat-peer-3/
-DEFAULTCONFIG = test_chat_peer3.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
@@ -41,7 +40,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[peerinfo]
@@ -58,7 +56,6 @@
PORT = 33008
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-chat
[testing]
Modified: gnunet/src/core/core.conf.in
===================================================================
--- gnunet/src/core/core.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/core/core.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@address@hidden = 2092
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/core/test_core_api_data.conf
===================================================================
--- gnunet/src/core/test_core_api_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/core/test_core_api_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
@INLINE@ test_core_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_core_api_data.conf
[arm]
DEFAULTSERVICES = topology hostlist
Modified: gnunet/src/core/test_core_api_peer1.conf
===================================================================
--- gnunet/src/core/test_core_api_peer1.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/core/test_core_api_peer1.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-peer-1/
-DEFAULTCONFIG = test_core_api_peer1.conf
[transport-tcp]
PORT = 12468
Modified: gnunet/src/core/test_core_api_peer2.conf
===================================================================
--- gnunet/src/core/test_core_api_peer2.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/core/test_core_api_peer2.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-peer-2/
-DEFAULTCONFIG = test_core_api_peer2.conf
[arm]
PORT = 22460
@@ -38,4 +37,4 @@
PORT = 22468
[transport-http]
-PORT = 22469
\ No newline at end of file
+PORT = 22469
Modified: gnunet/src/core/test_core_api_send_to_self.conf
===================================================================
--- gnunet/src/core/test_core_api_send_to_self.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/core/test_core_api_send_to_self.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = ~/.gnunet/
-DEFAULTCONFIG = test_core_api_send_to_self.conf
[arm]
PORT = 2425
@@ -22,7 +21,6 @@
PORT = 9252
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = test_core_api_send_to_self
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/core/test_core_defaults.conf
===================================================================
--- gnunet/src/core/test_core_defaults.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/core/test_core_defaults.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core/
-DEFAULTCONFIG = test_core_defaults.conf
[arm]
DEFAULTSERVICES =
Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-1/
-DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer1.conf
[transport-tcp]
PORT = 12488
Modified: gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-asym-recv-lim-peer-2/
-DEFAULTCONFIG = test_core_quota_asymmetric_recv_limited_peer2.conf
[arm]
@@ -42,4 +41,4 @@
PORT = 22468
[transport-http]
-PORT = 22469
\ No newline at end of file
+PORT = 22469
Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-1/
-DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer1.conf
[transport-tcp]
PORT = 12488
Modified: gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-asym-send-lim-peer-2/
-DEFAULTCONFIG = test_core_quota_asymmetric_send_limit_peer2.conf
[arm]
PORT = 22486
@@ -41,4 +40,4 @@
PORT = 22468
[transport-http]
-PORT = 22469
\ No newline at end of file
+PORT = 22469
Modified: gnunet/src/core/test_core_quota_peer1.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer1.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/core/test_core_quota_peer1.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-1/
-DEFAULTCONFIG = test_core_quota_peer1.conf
[transport-tcp]
PORT = 12468
Modified: gnunet/src/core/test_core_quota_peer2.conf
===================================================================
--- gnunet/src/core/test_core_quota_peer2.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/core/test_core_quota_peer2.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_core_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-core-quota-sym-peer-2/
-DEFAULTCONFIG = test_core_quota_peer2.conf
[arm]
PORT = 22476
@@ -41,4 +40,4 @@
PORT = 22468
[transport-http]
-PORT = 22469
\ No newline at end of file
+PORT = 22469
Modified: gnunet/src/datastore/datastore.conf.in
===================================================================
--- gnunet/src/datastore/datastore.conf.in 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/datastore/datastore.conf.in 2012-10-09 18:38:01 UTC (rev
24237)
@@ -6,7 +6,6 @@
@UNIXONLY@ PORT = 2093
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/perf_plugin_datastore_data_mysql.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-mysql/
-DEFAULTCONFIG = perf_plugin_datastore_data_mysql.conf
[datastore]
DATABASE = mysql
Modified: gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/perf_plugin_datastore_data_postgres.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-postgres/
-DEFAULTCONFIG = perf_plugin_datastore_data_postgres.conf
[datastore]
DATABASE = postgres
Modified: gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/perf_plugin_datastore_data_sqlite.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,5 +1,4 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/perf-gnunet-datastore-sqlite/
-DEFAULTCONFIG = perf_plugin_datastore_data_sqlite.conf
Modified: gnunet/src/datastore/test_datastore_api_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_mysql.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/test_datastore_api_data_mysql.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-mysql/
-DEFAULTCONFIG = test_datastore_api_data_mysql.conf
[TESTING]
WEAKRANDOM = YES
Modified: gnunet/src/datastore/test_datastore_api_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_postgres.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/test_datastore_api_data_postgres.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-postgres/
-DEFAULTCONFIG = test_datastore_api_data_postgres.conf
[TESTING]
WEAKRANDOM = YES
Modified: gnunet/src/datastore/test_datastore_api_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/test_datastore_api_data_sqlite.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/test_datastore_api_data_sqlite.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-sqlite/
-DEFAULTCONFIG = test_datastore_api_data_sqlite.conf
[TESTING]
WEAKRANDOM = YES
Modified: gnunet/src/datastore/test_plugin_datastore_data_mysql.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_mysql.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/test_plugin_datastore_data_mysql.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-mysql/
-DEFAULTCONFIG = test_plugin_datastore_data_mysql.conf
[datastore]
DATABASE = mysql
Modified: gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/test_plugin_datastore_data_postgres.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-postgres/
-DEFAULTCONFIG = test_plugin_datastore_data_postgres.conf
[datastore]
DATABASE = postgres
Modified: gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf
===================================================================
--- gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/datastore/test_plugin_datastore_data_sqlite.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,5 +1,4 @@
@INLINE@ test_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-datastore-plugin-sqlite/
-DEFAULTCONFIG = test_plugin_datastore_data_sqlite.conf
Modified: gnunet/src/dht/dht.conf.in
===================================================================
--- gnunet/src/dht/dht.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/dht/dht.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@address@hidden = 2095
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/dht/test_dht_2dtorus.conf
===================================================================
--- gnunet/src/dht/test_dht_2dtorus.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/dht/test_dht_2dtorus.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test_dht_topo/
-DEFAULTCONFIG = test_dht_2dtours.conf
[arm]
PORT = 10010
Modified: gnunet/src/dht/test_dht_api_data.conf
===================================================================
--- gnunet/src/dht/test_dht_api_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/dht/test_dht_api_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-dht-api/
-DEFAULTCONFIG = test_dht_api_data.conf
[fs]
AUTOSTART = NO
Modified: gnunet/src/dht/test_dht_api_peer1.conf
===================================================================
--- gnunet/src/dht/test_dht_api_peer1.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/dht/test_dht_api_peer1.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -52,7 +52,6 @@
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_dht_api_peer1.conf
SERVICEHOME = /tmp/test-gnunetd-dht-peer-1/
Modified: gnunet/src/dht/test_dht_line.conf
===================================================================
--- gnunet/src/dht/test_dht_line.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/dht/test_dht_line.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test_dht_topo/
-DEFAULTCONFIG = test_dht_line.conf
[arm]
PORT = 10010
Modified: gnunet/src/dht/test_dht_multipeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_multipeer_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/dht/test_dht_multipeer_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -13,7 +13,6 @@
#BINARY =
/home/mrwiggles/documents/research/gnunet/gnunet-ng/src/dht/.libs/gnunet-service-dht
#PREFIX = xterm -T dht -e gdb --args
#PREFIX = valgrind --log-file=dht_%p
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12100
@@ -37,7 +36,6 @@
ACCEPT_FROM = 127.0.0.1;
NEIGHBOUR_LIMIT = 50
BINARY = gnunet-service-transport
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12365
@@ -53,7 +51,6 @@
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-core
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12092
@@ -64,7 +61,6 @@
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-arm
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 12366
@@ -107,7 +103,6 @@
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_dht_multipeer_data.conf
SERVICEHOME = /tmp/test-dht-multipeer/
[nat]
Modified: gnunet/src/dht/test_dht_twopeer_data.conf
===================================================================
--- gnunet/src/dht/test_dht_twopeer_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/dht/test_dht_twopeer_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,5 +1,4 @@
[PATHS]
-DEFAULTCONFIG = test_dht_twopeer_data.conf
SERVICEHOME = /tmp/test-dht-twopeer/
[resolver]
Modified: gnunet/src/dns/dns.conf.in
===================================================================
--- gnunet/src/dns/dns.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/dns/dns.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -2,7 +2,6 @@
AUTOSTART = YES
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
UNIXPATH = /tmp/gnunet-service-dns.sock
Modified: gnunet/src/dv/dv.conf.in
===================================================================
--- gnunet/src/dv/dv.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/dv/dv.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -4,7 +4,6 @@
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-dv
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
@UNIXONLY@ PORT = 2571
Modified: gnunet/src/dv/test_transport_dv_data.conf
===================================================================
--- gnunet/src/dv/test_transport_dv_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/dv/test_transport_dv_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-dv-testing/
-DEFAULTCONFIG = test_transport_dv_data.conf
[resolver]
PORT = 2564
@@ -39,7 +38,6 @@
ACCEPT_FROM6 = ::1;
ACCEPT_FROM = 127.0.0.1;
BINARY = gnunet-service-dv
-CONFIG = $DEFAULTCONFIG
HOME = $SERVICEHOME
HOSTNAME = localhost
PORT = 2571
Modified: gnunet/src/exit/exit.conf
===================================================================
--- gnunet/src/exit/exit.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/exit/exit.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,5 +1,4 @@
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
# IPv6 address for the TUN interface (must be changed as this
Modified: gnunet/src/fs/fs.conf.in
===================================================================
--- gnunet/src/fs/fs.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/fs/fs.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -8,7 +8,6 @@
@UNIXONLY@ PORT = 2094
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -34,7 +33,6 @@
[gnunet-auto-share]
BINARY = gnunet-auto-share
-CONFIG = $DEFAULTCONFIG
# Note: MUST specify path to auto-share directory and CAN specify other options
# to gnunet-auto-share here!
Modified: gnunet/src/fs/test_fs_data.conf
===================================================================
--- gnunet/src/fs/test_fs_data.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/fs/test_fs_data.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-data/
-DEFAULTCONFIG = test_fs_data.conf
[fs]
ACTIVEMIGRATION = NO
Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/fs/test_fs_defaults.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-lib/
-DEFAULTCONFIG = fs_test_lib_data.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
Modified: gnunet/src/fs/test_fs_download_data.conf
===================================================================
--- gnunet/src/fs/test_fs_download_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_fs_download_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,5 +1,4 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-download/
-DEFAULTCONFIG = test_fs_download_data.conf
Modified: gnunet/src/fs/test_fs_file_information_data.conf
===================================================================
--- gnunet/src/fs/test_fs_file_information_data.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/fs/test_fs_file_information_data.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-file-information/
-DEFAULTCONFIG = test_fs_file_information_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_list_indexed_data.conf
===================================================================
--- gnunet/src/fs/test_fs_list_indexed_data.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/fs/test_fs_list_indexed_data.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-list-indexed/
-DEFAULTCONFIG = test_fs_list_indexed_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_namespace_data.conf
===================================================================
--- gnunet/src/fs/test_fs_namespace_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_fs_namespace_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-namespace/
-DEFAULTCONFIG = test_fs_namespace_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_publish_data.conf
===================================================================
--- gnunet/src/fs/test_fs_publish_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_fs_publish_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-publish/
-DEFAULTCONFIG = test_fs_publish_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_search_data.conf
===================================================================
--- gnunet/src/fs/test_fs_search_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_fs_search_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-search/
-DEFAULTCONFIG = test_fs_search_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_fs_unindex_data.conf
===================================================================
--- gnunet/src/fs/test_fs_unindex_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_fs_unindex_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-unindex/
-DEFAULTCONFIG = test_fs_unindex_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_gnunet_fs_idx_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_idx_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_gnunet_fs_idx_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-idx/
-DEFAULTCONFIG = test_gnunet_fs_idx_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_gnunet_fs_ns_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_ns_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_gnunet_fs_ns_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-ns/
-DEFAULTCONFIG = test_gnunet_fs_ns_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_gnunet_fs_psd_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_psd_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_gnunet_fs_psd_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-psd/
-DEFAULTCONFIG = test_gnunet_fs_psd_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_gnunet_fs_rec_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_fs_rec_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/fs/test_gnunet_fs_rec_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-py-rec/
-DEFAULTCONFIG = test_gnunet_fs_rec_data.conf
[transport]
PLUGINS =
Modified: gnunet/src/fs/test_gnunet_service_fs_migration_data.conf
===================================================================
--- gnunet/src/fs/test_gnunet_service_fs_migration_data.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/fs/test_gnunet_service_fs_migration_data.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_fs_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-service-fs-migration/
-DEFAULTCONFIG = test_gnunet_service_fs_migration_data.conf
[ats]
Modified: gnunet/src/gns/gns-helper-service-w32.conf
===================================================================
--- gnunet/src/gns/gns-helper-service-w32.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/gns/gns-helper-service-w32.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,5 +1,4 @@
[gns-helper-service-w32]
-CONFIG = $DEFAULTCONFIG
AUTOSTART = YES
BINARY = gnunet-gns-helper-service-w32
PORT = 5353
Modified: gnunet/src/gns/gns.conf.in
===================================================================
--- gnunet/src/gns/gns.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/gns/gns.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -2,7 +2,6 @@
AUTOSTART = YES
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-gns
UNIXPATH = /tmp/gnunet-service-gns.sock
@address@hidden = 2102
@@ -26,6 +25,5 @@
ZONEKEY = $SERVICEHOME/fcfsd/zonekey.zkey
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-gns-fcfsd
Modified: gnunet/src/gns/test_gns_dht_default.conf
===================================================================
--- gnunet/src/gns/test_gns_dht_default.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/gns/test_gns_dht_default.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,7 +1,6 @@
@INLINE@ test_gns_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-gns-dht/
-DEFAULTCONFIG = test_gns_dht_default.conf
[transport-tcp]
PORT = 22568
@@ -67,7 +66,6 @@
HIJACK_DNS = NO
UNIXPATH = /tmp/gnunet-service-gns-default.sock
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
AUTO_IMPORT_PKEY = NO
MAX_PARALLEL_BACKGROUND_QUERIES = 10
DEFAULT_LOOKUP_TIMEOUT = 10
@@ -81,7 +79,6 @@
UNIX_MATCH_GID = YES
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-namestore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/gns/test_gns_proxy.conf
===================================================================
--- gnunet/src/gns/test_gns_proxy.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/gns/test_gns_proxy.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-gns-proxy/
-DEFAULTCONFIG = test_gns_proxy.conf
[transport]
PLUGINS = tcp
@@ -16,7 +15,7 @@
[gns]
AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/hostkey
+ZONEKEY = $SERVICEHOME/.hostkey
HIJACK_DNS = YES
[gns-proxy]
@@ -29,4 +28,4 @@
[dns]
PROVIDE_EXIT = NO
#DNS_EXIT = 8.8.8.8
-#PREFIX = valgrind --leak-check=full
\ No newline at end of file
+#PREFIX = valgrind --leak-check=full
Modified: gnunet/src/gns/test_gns_simple_lookup.conf
===================================================================
--- gnunet/src/gns/test_gns_simple_lookup.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/gns/test_gns_simple_lookup.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -54,7 +54,6 @@
HOSTKEY = zonefiles/test_zonekey
[PATHS]
-DEFAULTCONFIG = test_gns_simple_lookup.conf
SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/
@@ -84,7 +83,6 @@
HIJACK_DNS = NO
UNIXPATH = /tmp/gnunet-service-gns.sock
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
AUTO_IMPORT_PKEY = YES
MAX_PARALLEL_BACKGROUND_QUERIES = 10
DEFAULT_LOOKUP_TIMEOUT = 15
@@ -104,7 +102,6 @@
UNIX_MATCH_GID = YES
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-namestore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/hostlist/hostlist.conf
===================================================================
--- gnunet/src/hostlist/hostlist.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/hostlist/hostlist.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
# consider having "-e" as default as well once implemented
OPTIONS = -b
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
-DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer1.conf
[transport-tcp]
PORT = 12968
Modified: gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/hostlist/test_gnunet_daemon_hostlist_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
-DEFAULTCONFIG = test_gnunet_daemon_hostlist_peer2.conf
[transport-tcp]
PORT = 22968
Modified: gnunet/src/hostlist/test_hostlist_defaults.conf
===================================================================
--- gnunet/src/hostlist/test_hostlist_defaults.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/hostlist/test_hostlist_defaults.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist/
-DEFAULTCONFIG = test_hostlist_default.conf
[resolver]
PORT = 12464
Modified: gnunet/src/hostlist/test_learning_adv_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_adv_peer.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/hostlist/test_learning_adv_peer.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-1/
-DEFAULTCONFIG = test_learning_adv_peer.conf
[transport-tcp]
PORT = 22968
Modified: gnunet/src/hostlist/test_learning_learn_peer.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/hostlist/test_learning_learn_peer.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-2/
-DEFAULTCONFIG = test_learning_learn_peer.conf
[transport-tcp]
PORT = 12968
Modified: gnunet/src/hostlist/test_learning_learn_peer2.conf
===================================================================
--- gnunet/src/hostlist/test_learning_learn_peer2.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/hostlist/test_learning_learn_peer2.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_hostlist_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-hostlist-peer-3/
-DEFAULTCONFIG = test_learning_learn_peer2.conf
[transport-tcp]
PORT = 32968
Modified: gnunet/src/integration-tests/confs/c_bootstrap_server.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_bootstrap_server/
-DEFAULTCONFIG = confs/c_bootstrap_server.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@
PORT = 20017
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@
PORT = 20016
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@
PORT = 20015
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -67,7 +62,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -78,7 +72,6 @@
PORT = 20014
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@
PORT = 20013
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -125,7 +117,6 @@
PORT = 20012
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -147,7 +138,6 @@
PORT = 20011
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +189,6 @@
PORT = 20006
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -217,7 +206,6 @@
PORT = 20005
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -232,7 +220,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -243,7 +230,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -258,7 +244,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -269,7 +254,6 @@
PORT = 20004
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -282,7 +266,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -p
#SERVERS = http://v9.gnunet.org:58080/
@@ -293,7 +276,6 @@
PORT = 20003
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -327,7 +309,6 @@
PORT = 20001
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -340,7 +321,6 @@
PORT = 20000
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -370,4 +350,4 @@
AUTOSTART = NO
[lockmanager]
-AUTOSTART = NO
\ No newline at end of file
+AUTOSTART = NO
Modified: gnunet/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server_w_massif.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_bootstrap_server/
-DEFAULTCONFIG = confs/c_bootstrap_server_w_massif.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -22,7 +20,6 @@
PORT = 20017
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -35,7 +32,6 @@
PORT = 20016
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -48,7 +44,6 @@
PORT = 20015
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -67,7 +62,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -78,7 +72,6 @@
PORT = 20014
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -101,7 +94,6 @@
PORT = 20013
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -125,7 +117,6 @@
PORT = 20012
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -148,7 +139,6 @@
PORT = 20011
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -200,7 +190,6 @@
PORT = 20006
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -218,7 +207,6 @@
PORT = 20005
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -233,7 +221,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -244,7 +231,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -259,7 +245,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -270,7 +255,6 @@
PORT = 20004
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -283,7 +267,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -p
#SERVERS = http://v9.gnunet.org:58080/
@@ -294,7 +277,6 @@
PORT = 20003
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -328,7 +310,6 @@
PORT = 20001
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -341,7 +322,6 @@
PORT = 20000
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_nat_client.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_nat_client.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_nat_client
-DEFAULTCONFIG = confs/c_nat_client.conf
[gnunetd]
HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@
PORT = 20071
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@
PORT = 20070
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@
PORT = 20069
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -87,7 +81,6 @@
PORT = 20068
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@
PORT = 20067
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@
PORT = 20066
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@
PORT = 20065
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@
PORT = 20060
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@
PORT = 20059
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -249,7 +236,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -264,7 +250,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@
PORT = 20058
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -299,7 +282,6 @@
PORT = 20057
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@
PORT = 20055
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@
PORT = 20054
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = confs/c_no_nat_client.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@
PORT = 20035
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@
PORT = 20034
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@
PORT = 20033
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -84,7 +78,6 @@
PORT = 20032
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@
PORT = 20031
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@
PORT = 20030
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@
PORT = 20029
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -207,7 +197,6 @@
PORT = 20024
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -225,7 +214,6 @@
PORT = 20023
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -240,7 +228,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -251,7 +238,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -266,7 +252,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -277,7 +262,6 @@
PORT = 20022
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -290,7 +274,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -301,7 +284,6 @@
PORT = 20021
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -335,7 +317,6 @@
PORT = 20019
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -348,7 +329,6 @@
PORT = 20018
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = confs/c_no_nat_client_2.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -11,7 +10,6 @@
PORT = 20053
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -24,7 +22,6 @@
PORT = 20052
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -37,7 +34,6 @@
PORT = 20051
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -56,7 +52,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -67,7 +62,6 @@
PORT = 20050
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -90,7 +84,6 @@
PORT = 20049
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -114,7 +107,6 @@
PORT = 20048
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -136,7 +128,6 @@
PORT = 20047
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -188,7 +179,6 @@
PORT = 20042
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -206,7 +196,6 @@
PORT = 20041
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -221,7 +210,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -232,7 +220,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -247,7 +234,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -258,7 +244,6 @@
PORT = 20040
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -271,7 +256,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -282,7 +266,6 @@
PORT = 20039
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -316,7 +299,6 @@
PORT = 20037
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -329,7 +311,6 @@
PORT = 20036
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = confs/c_no_nat_client_http.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@
PORT = 20035
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@
PORT = 20034
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@
PORT = 20033
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -84,7 +78,6 @@
PORT = 20032
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@
PORT = 20031
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@
PORT = 20030
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@
PORT = 20029
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -207,7 +197,6 @@
PORT = 20024
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -225,7 +214,6 @@
PORT = 20023
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -240,7 +228,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -251,7 +238,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -266,7 +252,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -277,7 +262,6 @@
PORT = 20022
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -290,7 +274,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -301,7 +284,6 @@
PORT = 20021
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -335,7 +317,6 @@
PORT = 20019
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -348,7 +329,6 @@
PORT = 20018
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_http_2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = confs/c_no_nat_client_http_2.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@
PORT = 20053
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -30,7 +28,6 @@
PORT = 20052
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -43,7 +40,6 @@
PORT = 20051
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -62,7 +58,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -73,7 +68,6 @@
PORT = 20050
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -96,7 +90,6 @@
PORT = 20049
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -120,7 +113,6 @@
PORT = 20048
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -144,7 +136,6 @@
PORT = 20047
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -196,7 +187,6 @@
PORT = 20042
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -214,7 +204,6 @@
PORT = 20041
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -229,7 +218,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -240,7 +228,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -255,7 +242,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -266,7 +252,6 @@
PORT = 20040
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -279,7 +264,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -290,7 +274,6 @@
PORT = 20039
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -324,7 +307,6 @@
PORT = 20037
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -337,7 +319,6 @@
PORT = 20036
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client/
-DEFAULTCONFIG = confs/c_no_nat_client_unix.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -28,7 +26,6 @@
PORT = 20035
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -41,7 +38,6 @@
PORT = 20034
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -54,7 +50,6 @@
PORT = 20033
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -73,7 +68,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -84,7 +78,6 @@
PORT = 20032
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -107,7 +100,6 @@
PORT = 20031
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@
PORT = 20030
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -155,7 +146,6 @@
PORT = 20029
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -210,7 +200,6 @@
PORT = 20024
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -228,7 +217,6 @@
PORT = 20023
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -243,7 +231,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -254,7 +241,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -269,7 +255,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -280,7 +265,6 @@
PORT = 20022
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -293,7 +277,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -304,7 +287,6 @@
PORT = 20021
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -338,7 +320,6 @@
PORT = 20019
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -351,7 +332,6 @@
PORT = 20018
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_no_nat_client_unix_2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = confs/c_no_nat_client_unix_2.conf
[gnunetd]
#HOSTKEY = $SERVICEHOME/.hostkey
@@ -17,7 +16,6 @@
PORT = 20053
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -30,7 +28,6 @@
PORT = 20052
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -43,7 +40,6 @@
PORT = 20051
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -62,7 +58,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -73,7 +68,6 @@
PORT = 20050
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -96,7 +90,6 @@
PORT = 20049
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -120,7 +113,6 @@
PORT = 20048
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -144,7 +136,6 @@
PORT = 20047
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -199,7 +190,6 @@
PORT = 20042
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -217,7 +207,6 @@
PORT = 20041
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -232,7 +221,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -243,7 +231,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -258,7 +245,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -269,7 +255,6 @@
PORT = 20040
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -282,7 +267,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://localhost:8080/
@@ -293,7 +277,6 @@
PORT = 20039
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -327,7 +310,6 @@
PORT = 20037
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -340,7 +322,6 @@
PORT = 20036
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_normal_client
-DEFAULTCONFIG = confs/c_normal_client_tcp.conf
[gnunetd]
HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@
PORT = 20071
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@
PORT = 20070
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@
PORT = 20069
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -87,7 +81,6 @@
PORT = 20068
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@
PORT = 20067
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@
PORT = 20066
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@
PORT = 20065
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@
PORT = 20060
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@
PORT = 20059
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -249,7 +236,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -264,7 +250,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@
PORT = 20058
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@
PORT = 20057
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@
PORT = 20055
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@
PORT = 20054
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_normal_client
-DEFAULTCONFIG = confs/c_normal_client_tcp_udp.conf
[gnunetd]
HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@
PORT = 20071
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@
PORT = 20070
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@
PORT = 20069
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -87,7 +81,6 @@
PORT = 20068
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@
PORT = 20067
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@
PORT = 20066
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@
PORT = 20065
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@
PORT = 20060
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@
PORT = 20059
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -249,7 +236,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -264,7 +250,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@
PORT = 20058
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@
PORT = 20057
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@
PORT = 20055
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@
PORT = 20054
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -367,4 +347,4 @@
[dhtcache]
DATABASE = sqlite
-QUOTA = 1 MB
\ No newline at end of file
+QUOTA = 1 MB
Modified: gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/c_normal_client
-DEFAULTCONFIG = confs/c_normal_client_tcp_udp_http.conf
[gnunetd]
HOSTKEY = hostkeys/0002-hostkey
@@ -19,7 +18,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -31,7 +29,6 @@
PORT = 20071
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -44,7 +41,6 @@
PORT = 20070
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -57,7 +53,6 @@
PORT = 20069
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -76,7 +71,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
[datastore]
@@ -87,7 +81,6 @@
PORT = 20068
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-datastore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -110,7 +103,6 @@
PORT = 20067
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -131,7 +123,6 @@
PORT = 20066
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-ats
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -153,7 +144,6 @@
PORT = 20065
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
NEIGHBOUR_LIMIT = 50
ACCEPT_FROM = 127.0.0.1;
@@ -205,7 +195,6 @@
PORT = 20060
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -223,7 +212,6 @@
PORT = 20059
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-fs
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -238,7 +226,6 @@
EXPECTED_NEIGHBOUR_COUNT = 128
[vpn]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-vpn
IPV6ADDR = 1234::1
IPV6PREFIX = 32
@@ -249,7 +236,6 @@
IFNAME = vpn-gnunet
[exit]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-exit
IPV6ADDR = 1234:1::1
IPV6PREFIX = 32
@@ -264,7 +250,6 @@
PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dns
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -275,7 +260,6 @@
PORT = 20058
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -288,7 +272,6 @@
HTTPPORT = 8080
HOME = $SERVICEHOME
HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-hostlist
OPTIONS = -b
SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/
@@ -299,7 +282,6 @@
PORT = 20057
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-core
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -333,7 +315,6 @@
PORT = 20055
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -346,7 +327,6 @@
PORT = 20054
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-dht
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -367,4 +347,4 @@
[dhtcache]
DATABASE = sqlite
-QUOTA = 1 MB
\ No newline at end of file
+QUOTA = 1 MB
Modified: gnunet/src/lockmanager/lockmanager.conf.in
===================================================================
--- gnunet/src/lockmanager/lockmanager.conf.in 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/lockmanager/lockmanager.conf.in 2012-10-09 18:38:01 UTC (rev
24237)
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 2100
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-lockmanager
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/lockmanager/test_lockmanager_api.conf
===================================================================
--- gnunet/src/lockmanager/test_lockmanager_api.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/lockmanager/test_lockmanager_api.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -63,7 +63,6 @@
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_lockmanager_api.conf
SERVICEHOME = /tmp/test-lockmanager/
[dns]
Modified: gnunet/src/mesh/mesh.conf.in
===================================================================
--- gnunet/src/mesh/mesh.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/mesh/mesh.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 2096
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-mesh
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/mesh/test_mesh.conf
===================================================================
--- gnunet/src/mesh/test_mesh.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/mesh/test_mesh.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -72,7 +72,6 @@
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_mesh.conf
SERVICEHOME = /tmp/test-mesh/
[dns]
Modified: gnunet/src/mesh/test_mesh_2dtorus.conf
===================================================================
--- gnunet/src/mesh/test_mesh_2dtorus.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/mesh/test_mesh_2dtorus.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test_mesh_small/
-DEFAULTCONFIG = test_mesh_small.conf
[arm]
PORT = 10010
Modified: gnunet/src/mesh/test_mesh_path.conf
===================================================================
--- gnunet/src/mesh/test_mesh_path.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/mesh/test_mesh_path.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -69,7 +69,6 @@
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_mesh.conf
SERVICEHOME = /tmp/test-mesh/
[dns]
Modified: gnunet/src/mesh/test_mesh_small.conf
===================================================================
--- gnunet/src/mesh/test_mesh_small.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/mesh/test_mesh_small.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test_mesh_small/
-DEFAULTCONFIG = test_mesh_small.conf
[mesh]
PORT = 10005
Modified: gnunet/src/namestore/namestore.conf.in
===================================================================
--- gnunet/src/namestore/namestore.conf.in 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/namestore/namestore.conf.in 2012-10-09 18:38:01 UTC (rev
24237)
@@ -6,7 +6,6 @@
@UNIXONLY@ PORT = 2099
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-namestore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/namestore/test_namestore_api.conf
===================================================================
--- gnunet/src/namestore/test_namestore_api.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/namestore/test_namestore_api.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -12,7 +12,6 @@
PORT = 2099
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-namestore
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/nat/test_nat_data.conf
===================================================================
--- gnunet/src/nat/test_nat_data.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/nat/test_nat_data.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,8 +1,6 @@
[PATHS]
SERVICEHOME = /tmp/nat-test
# SERVICEHOME = /var/lib/gnunet/
-# DEFAULTCONFIG = /etc/gnunet.conf
-# If 'DEFAULTCONFIG' is not defined, the current
# configuration file is assumed to be the default,
# which is what we want by default...
@@ -51,7 +49,6 @@
PORT = 2087
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -75,7 +72,6 @@
PORT = 2088
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -97,7 +93,6 @@
PORT = 2089
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/nat/test_nat_test_data.conf
===================================================================
--- gnunet/src/nat/test_nat_test_data.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/nat/test_nat_test_data.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,8 +1,6 @@
[PATHS]
SERVICEHOME = /tmp/nat-test
# SERVICEHOME = /var/lib/gnunet/
-# DEFAULTCONFIG = /etc/gnunet.conf
-# If 'DEFAULTCONFIG' is not defined, the current
# configuration file is assumed to be the default,
# which is what we want by default...
Modified: gnunet/src/nse/nse.conf.in
===================================================================
--- gnunet/src/nse/nse.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/nse/nse.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@address@hidden = 2097
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-nse
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/nse/nse_profiler_test.conf
===================================================================
--- gnunet/src/nse/nse_profiler_test.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/nse/nse_profiler_test.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/nse-profiler/
-DEFAULTCONFIG = nse_profiler_test.conf
[nse]
PORT = 0
@@ -10,7 +9,6 @@
#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
AUTOSTART = NO
DEBUG = YES
-CONFIG = $DEFAULTCONFIG
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
WORKDELAY = 60 s
Modified: gnunet/src/nse/test_nse.conf
===================================================================
--- gnunet/src/nse/test_nse.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/nse/test_nse.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-nse-multipeer/
-DEFAULTCONFIG = test_nse.conf
[nse]
PORT = 22353
@@ -10,7 +9,6 @@
#PREFIX = valgrind --leak-check=full --log-file=valgrind_nse.%p
AUTOSTART = YES
DEBUG = NO
-CONFIG = $DEFAULTCONFIG
PROOFFILE = $SERVICEHOME/proof.nse
# Overriding network settings for faster testing (do NOT use
# these values in production just because they are here)
Modified: gnunet/src/peerinfo/peerinfo.conf.in
===================================================================
--- gnunet/src/peerinfo/peerinfo.conf.in 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/peerinfo/peerinfo.conf.in 2012-10-09 18:38:01 UTC (rev
24237)
@@ -3,7 +3,6 @@
@address@hidden = 2090
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-peerinfo
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/pt/pt.conf
===================================================================
--- gnunet/src/pt/pt.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/pt/pt.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,5 +1,4 @@
[pt]
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-pt
# Set this to YES to tunnel IPv4 traffic over GNUnet
Modified: gnunet/src/pt/test_gns_vpn.conf
===================================================================
--- gnunet/src/pt/test_gns_vpn.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/pt/test_gns_vpn.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -47,7 +47,7 @@
[gns]
AUTOSTART = YES
-ZONEKEY = $SERVICEHOME/hostkey
+ZONEKEY = $SERVICEHOME/.hostkey
HIJACK_DNS = YES
[namestore]
Modified: gnunet/src/pt/test_gnunet_vpn.conf
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/pt/test_gnunet_vpn.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-vpn/
-DEFAULTCONFIG = test_gnunet_vpn.conf
[transport]
PLUGINS = tcp
Modified: gnunet/src/regex/test_regex_big.conf
===================================================================
--- gnunet/src/regex/test_regex_big.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/regex/test_regex_big.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -72,7 +72,6 @@
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_stream_local.conf
SERVICEHOME = /tmp/test-stream/
[dns]
Modified: gnunet/src/statistics/statistics.conf.in
===================================================================
--- gnunet/src/statistics/statistics.conf.in 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/statistics/statistics.conf.in 2012-10-09 18:38:01 UTC (rev
24237)
@@ -3,7 +3,6 @@
@address@hidden = 2088
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-statistics
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/statistics/test_statistics_api_data.conf
===================================================================
--- gnunet/src/statistics/test_statistics_api_data.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/statistics/test_statistics_api_data.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-statistics/
-DEFAULTCONFIG = test_statistics_api_data.conf
[statistics]
PORT = 22353
Modified: gnunet/src/stream/test_stream_local.conf
===================================================================
--- gnunet/src/stream/test_stream_local.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/stream/test_stream_local.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -73,7 +73,6 @@
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_stream_local.conf
SERVICEHOME = /tmp/test-stream/
[dns]
Modified: gnunet/src/template/template.conf
===================================================================
--- gnunet/src/template/template.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/template/template.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
PORT = 9999
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-template
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/testbed/test_testbed_api.conf
===================================================================
--- gnunet/src/testbed/test_testbed_api.conf 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/testbed/test_testbed_api.conf 2012-10-09 18:38:01 UTC (rev
24237)
@@ -62,7 +62,6 @@
HOSTKEY = $SERVICEHOME/.hostkey
[PATHS]
-DEFAULTCONFIG = test_testbed_api.conf
SERVICEHOME = /tmp/test-testbed/
[dns]
Modified: gnunet/src/testbed/testbed.conf.in
===================================================================
--- gnunet/src/testbed/testbed.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testbed/testbed.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 2101
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-testbed
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
@@ -12,4 +11,4 @@
UNIX_MATCH_GID = YES
MAX_PARALLEL_OPERATIONS = 1000
MAX_PARALLEL_SERVICE_CONNECTIONS = 1000
-MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
\ No newline at end of file
+MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 5
Modified: gnunet/src/testing/test_testing_defaults.conf
===================================================================
--- gnunet/src/testing/test_testing_defaults.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/testing/test_testing_defaults.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_defaults.conf
[resolver]
PORT = 2564
Modified: gnunet/src/testing_old/test_testing_2dtorus.conf
===================================================================
--- gnunet/src/testing_old/test_testing_2dtorus.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/testing_old/test_testing_2dtorus.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test_testing_2dtorus/
-DEFAULTCONFIG = test_testing_2dtorus.conf
[arm]
PORT = 10010
Modified: gnunet/src/testing_old/test_testing_connect_peer1.conf
===================================================================
--- gnunet/src/testing_old/test_testing_connect_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_connect_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing-connect-peer1/
-DEFAULTCONFIG = test_testing_connect_peer1.conf
[transport-tcp]
PORT = 12568
Modified: gnunet/src/testing_old/test_testing_connect_peer2.conf
===================================================================
--- gnunet/src/testing_old/test_testing_connect_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_connect_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing-connect-peer2/
-DEFAULTCONFIG = test_testing_connect_peer2.conf
[transport-tcp]
PORT = 22568
Modified: gnunet/src/testing_old/test_testing_data.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/testing_old/test_testing_data.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data.conf
[arm]
DEFAULTSERVICES = core
Modified: gnunet/src/testing_old/test_testing_data_remote.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_remote.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_remote.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_remote.conf
[TESTING_old]
CONTROL_HOST = 127.0.0.1
Modified: gnunet/src/testing_old/test_testing_data_topology_2d_torus.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_2d_torus.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_2d_torus.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_2d_torus.conf
[TESTING_old]
NUM_PEERS = 13
Modified: gnunet/src/testing_old/test_testing_data_topology_blacklist.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_blacklist.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_blacklist.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_blacklist.conf
[TESTING_old]
NUM_PEERS = 4
Modified: gnunet/src/testing_old/test_testing_data_topology_churn.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_churn.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_churn.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_churn.conf
[TESTING_old]
NUM_PEERS = 12
Modified: gnunet/src/testing_old/test_testing_data_topology_clique.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_clique.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_clique.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
CONNECT_TIMEOUT = 180 s
Modified: gnunet/src/testing_old/test_testing_data_topology_clique_dfs.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_clique_dfs.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_clique_dfs.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 7
Modified: gnunet/src/testing_old/test_testing_data_topology_clique_minimum.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_clique_minimum.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_clique_minimum.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 20
Modified: gnunet/src/testing_old/test_testing_data_topology_clique_random.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_clique_random.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_clique_random.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 20
Modified: gnunet/src/testing_old/test_testing_data_topology_erdos_renyi.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_erdos_renyi.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_erdos_renyi.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
TOPOLOGY = ERDOS_RENYI
Modified: gnunet/src/testing_old/test_testing_data_topology_internat.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_internat.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_internat.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
TOPOLOGY = INTERNAT
Modified: gnunet/src/testing_old/test_testing_data_topology_none.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_none.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_none.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 1000
Modified: gnunet/src/testing_old/test_testing_data_topology_ring.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_ring.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_ring.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
TOPOLOGY = RING
Modified: gnunet/src/testing_old/test_testing_data_topology_scale_free.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_scale_free.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_scale_free.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_scale_free.conf
[TESTING_old]
NUM_PEERS = 50
Modified:
gnunet/src/testing_old/test_testing_data_topology_small_world_ring.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_small_world_ring.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_small_world_ring.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
NUM_PEERS = 25
Modified:
gnunet/src/testing_old/test_testing_data_topology_small_world_torus.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_small_world_torus.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_small_world_torus.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
TOPOLOGY = SMALL_WORLD
Modified: gnunet/src/testing_old/test_testing_data_topology_stability.conf
===================================================================
--- gnunet/src/testing_old/test_testing_data_topology_stability.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_data_topology_stability.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_data_topology_clique.conf
[TESTING_old]
SETTLE_TIME = 600 s
Modified: gnunet/src/testing_old/test_testing_defaults.conf
===================================================================
--- gnunet/src/testing_old/test_testing_defaults.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/testing_old/test_testing_defaults.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-gnunet-testing/
-DEFAULTCONFIG = test_testing_defaults.conf
[resolver]
PORT = 2564
Modified: gnunet/src/testing_old/test_testing_peergroup_data.conf
===================================================================
--- gnunet/src/testing_old/test_testing_peergroup_data.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/testing_old/test_testing_peergroup_data.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_testing_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_testing_peergroup_data.conf
[TESTING_old]
CONNECT_ATTEMPTS = 2
Modified: gnunet/src/topology/topology.conf
===================================================================
--- gnunet/src/topology/topology.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/topology/topology.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -4,7 +4,6 @@
AUTOCONNECT = YES
TARGET-CONNECTION-COUNT = 16
FRIENDS = $SERVICEHOME/friends
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-daemon-topology
Modified: gnunet/src/transport/template_cfg_peer1.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer1.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/transport/template_cfg_peer1.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = template_cfg_peer1.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
Modified: gnunet/src/transport/template_cfg_peer2.conf
===================================================================
--- gnunet/src/transport/template_cfg_peer2.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/transport/template_cfg_peer2.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = template_cfg_peer2.conf
[gnunetd]
HOSTKEY = $SERVICEHOME/.hostkey
Modified: gnunet/src/transport/test_plugin_transport_data.conf
===================================================================
--- gnunet/src/transport/test_plugin_transport_data.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_plugin_transport_data.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
-DEFAULTCONFIG = test_plugin_transport_data.conf
[transport-tcp]
PORT = 2400
Modified: gnunet/src/transport/test_quota_compliance_data.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_data.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_data.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
SERVICEHOME = /tmp/test-gnunetd-plugin-transport/
-DEFAULTCONFIG = test_quota_compliance_data.conf
[transport-tcp]
PORT = 2368
Modified: gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_http_asymmetric_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1
-DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer1.conf
[transport-http_client]
Modified: gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_http_asymmetric_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_http_asymmetric_peer2.conf
[transport-http_server]
PORT = 3010
Modified: gnunet/src/transport/test_quota_compliance_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_http_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1
-DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
[transport-http_client]
Modified: gnunet/src/transport/test_quota_compliance_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_http_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_http_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
[transport-http_server]
PORT = 3010
Modified: gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_https_asymmetric_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer1.conf
[transport-https_client]
Modified: gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_https_asymmetric_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_https_asymmetric_peer2.conf
[transport-https_server]
PORT = 3001
Modified: gnunet/src/transport/test_quota_compliance_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_https_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
[transport-https_client]
Modified: gnunet/src/transport/test_quota_compliance_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_https_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_https_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
[transport-https_server]
PORT = 3001
Modified: gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
-DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf
[transport-tcp]
PORT = 4094
Modified: gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/quota-tcp-p2/
-DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_quota_compliance_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
-DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
[transport-tcp]
PORT = 4094
Modified: gnunet/src/transport/test_quota_compliance_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_tcp_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_quota_compliance_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_udp_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_udp_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
[transport-udp]
PORT = 4368
Modified: gnunet/src/transport/test_quota_compliance_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_udp_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_udp_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
[transport-udp]
PORT = 3368
Modified: gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer1.conf
[arm]
PORT = 4087
Modified: gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_unix_asymmetric_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_unix_asymmetric_peer2.conf
[arm]
PORT = 3087
Modified: gnunet/src/transport/test_quota_compliance_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_unix_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer1/
-DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf
[transport-unix]
PORT = 12120
Modified: gnunet/src/transport/test_quota_compliance_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_unix_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_unix_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
-DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf
[transport-unix]
PORT = 12136
Modified: gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
TESTMODE = 1
Modified: gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_wlan_asymmetric_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
Modified: gnunet/src/transport/test_quota_compliance_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_wlan_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
TESTMODE = 1
Modified: gnunet/src/transport/test_quota_compliance_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_quota_compliance_wlan_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_quota_compliance_wlan_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
Modified:
gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer1.conf
[arm]
PORT = 12000
@@ -43,4 +42,4 @@
[transport-https]
PORT = 12009
-TIMEOUT = 5 s
\ No newline at end of file
+TIMEOUT = 5 s
Modified:
gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_bidirectional_connect_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_bidirectional_connect_peer2.conf
[arm]
PORT = 12010
@@ -42,4 +41,4 @@
[transport-https]
PORT = 12019
-TIMEOUT = 5 s
\ No newline at end of file
+TIMEOUT = 5 s
Modified: gnunet/src/transport/test_transport_api_data.conf
===================================================================
--- gnunet/src/transport/test_transport_api_data.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/transport/test_transport_api_data.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_transport_api_data.conf
[transport-tcp]
PORT = 2094
Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_disconnect_tcp_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_api_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_http_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_http_peer1.conf
[transport-http_client]
Modified: gnunet/src/transport/test_transport_api_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_http_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_http_peer2.conf
[transport-http_server]
PORT = 12090
Modified: gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_http_reverse_peer1.conf
[transport-http_client]
Modified: gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_http_reverse_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_http_reverse_peer2.conf
[transport-http_client]
Modified: gnunet/src/transport/test_transport_api_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_https_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_https_peer1.conf
[transport-https_client]
PORT = 12100
Modified: gnunet/src/transport/test_transport_api_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_https_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_https_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_https_peer2.conf
[transport-https_server]
PORT = 12110
Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_limited_sockets_tcp_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 0
Modified: gnunet/src/transport/test_transport_api_multi_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_multi_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-multi-p1/
-DEFAULTCONFIG = test_transport_api_multi_peer1.conf
[transport-tcp]
PORT = 12140
Modified: gnunet/src/transport/test_transport_api_multi_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_multi_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_multi_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-multi-p2/
-DEFAULTCONFIG = test_transport_api_multi_peer2.conf
[nat]
ALLOW_NAT = NO
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_reliability_http_peer1.conf
[transport-http_client]
Modified: gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_http_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_reliability_http_peer2.conf
[transport-http_server]
PORT = 12090
Modified: gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_reliability_https_peer1.conf
[transport-https_client]
Modified: gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_https_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_reliability_https_peer2.conf
[transport-https_server]
PORT = 12310
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p1/
-DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer1.conf
[nat]
BEHIND_NAT = YES
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_nat_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-reliability-tcp-nat-p2/
-DEFAULTCONFIG = test_transport_api_reliability_tcp_nat_peer2.conf
[nat]
DISABLEV6 = YES
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_reliability_tcp_peer1.conf
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_tcp_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_reliability_tcp_peer2.conf
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_wlan_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
TESTMODE = 1
Modified: gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_reliability_wlan_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-nat-p1/
-DEFAULTCONFIG = test_transport_api_tcp_nat_peer1.conf
[nat]
BEHIND_NAT = YES
Modified: gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_tcp_nat_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-nat-p2/
-DEFAULTCONFIG = test_transport_api_tcp_nat_peer2.conf
[nat]
DISABLEV6 = YES
Modified: gnunet/src/transport/test_transport_api_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_tcp_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_tcp_peer1.conf
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_tcp_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_tcp_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_tcp_peer2.conf
[transport-tcp]
PORT = 12015
Modified: gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p1/
-DEFAULTCONFIG = test_transport_api_timeout_http_peer1.conf
[nat]
Modified: gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_http_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-http-p2/
-DEFAULTCONFIG = test_transport_api_timeout_http_peer2.conf
[nat]
Modified: gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p1/
-DEFAULTCONFIG = test_transport_api_timeout_https_peer1.conf
[transport-https_client]
Modified: gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_https_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-https-p2/
-DEFAULTCONFIG = test_transport_api_timeout_https_peer2.conf
[transport-https_server]
PORT = 12110
Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p1/
-DEFAULTCONFIG = test_transport_api_timeout_tcp_peer1.conf
[transport-tcp]
PORT = 12000
Modified: gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_tcp_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
-DEFAULTCONFIG = test_transport_api_timeout_tcp_peer2.conf
[nat]
ALLOW_NAT = NO
Modified: gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_udp_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p1/
-DEFAULTCONFIG = test_transport_api_udp_peer1.conf
[transport-udp]
PORT = 12040
Modified: gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_udp_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p2/
-DEFAULTCONFIG = test_transport_api_udp_peer2.conf
[transport-udp]
PORT = 12050
Modified: gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_unix_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p1/
-DEFAULTCONFIG = test_transport_api_unix_peer1.conf
[arm]
PORT = 12125
Modified: gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_timeout_unix_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p2/
-DEFAULTCONFIG = test_transport_api_unix_peer2.conf
[arm]
PORT = 12135
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-nat-p1/
-DEFAULTCONFIG = test_transport_api_udp_nat_peer1.conf
[nat]
BEHIND_NAT = YES
Modified: gnunet/src/transport/test_transport_api_udp_nat_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_udp_nat_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-nat-p2/
-DEFAULTCONFIG = test_transport_api_udp_nat_peer2.conf
[nat]
ALLOW_NAT = YES
Modified: gnunet/src/transport/test_transport_api_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_udp_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p1/
-DEFAULTCONFIG = test_transport_api_udp_peer1.conf
[transport-udp]
PORT = 12040
Modified: gnunet/src/transport/test_transport_api_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_udp_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_udp_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p2/
-DEFAULTCONFIG = test_transport_api_udp_peer2.conf
[transport-udp]
PORT = 12050
Modified: gnunet/src/transport/test_transport_api_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unix_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_unix_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p1/
-DEFAULTCONFIG = test_transport_api_unix_peer1.conf
[arm]
PORT = 12125
Modified: gnunet/src/transport/test_transport_api_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unix_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_unix_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p2/
-DEFAULTCONFIG = test_transport_api_unix_peer2.conf
[arm]
PORT = 12135
Modified:
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
===================================================================
---
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p1/
-DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer1.conf
[transport-udp]
PORT = 12040
Modified:
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
===================================================================
---
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++
gnunet/src/transport/test_transport_api_unreliability_constant_udp_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p2/
-DEFAULTCONFIG = test_transport_api_unreliability_constant_udp_peer2.conf
[transport-udp]
PORT = 12050
Modified: gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p1/
-DEFAULTCONFIG = test_transport_api_unreliability_udp_peer1.conf
[transport-udp]
PORT = 12040
Modified: gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_unreliability_udp_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-udp-p2/
-DEFAULTCONFIG = test_transport_api_unreliability_udp_peer2.conf
[transport-udp]
PORT = 12050
Modified: gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p1/
-DEFAULTCONFIG = test_transport_api_unreliability_unix_peer1.conf
[arm]
PORT = 12125
Modified: gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_unreliability_unix_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-unix-p2/
-DEFAULTCONFIG = test_transport_api_unreliability_unix_peer2.conf
[arm]
PORT = 12135
Modified: gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer1.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
TESTMODE = 1
Modified: gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_unreliability_wlan_peer2.conf
2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
Modified: gnunet/src/transport/test_transport_api_wlan_peer1.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer1.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_wlan_peer1.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer1.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p1/
-DEFAULTCONFIG = test_transport_api_wlan_peer1.conf
[transport-wlan]
INTERFACE = mon0
Modified: gnunet/src/transport/test_transport_api_wlan_peer2.conf
===================================================================
--- gnunet/src/transport/test_transport_api_wlan_peer2.conf 2012-10-09
17:44:43 UTC (rev 24236)
+++ gnunet/src/transport/test_transport_api_wlan_peer2.conf 2012-10-09
18:38:01 UTC (rev 24237)
@@ -1,7 +1,6 @@
@INLINE@ template_cfg_peer2.conf
[PATHS]
SERVICEHOME = /tmp/test-transport/api-wlan-p2/
-DEFAULTCONFIG = test_transport_api_wlan_peer2.conf
[transport-wlan]
INTERFACE = mon1
Modified: gnunet/src/transport/test_transport_defaults.conf
===================================================================
--- gnunet/src/transport/test_transport_defaults.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/transport/test_transport_defaults.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,6 +1,5 @@
[PATHS]
SERVICEHOME = /tmp/test-transport-api/
-DEFAULTCONFIG = test_transport_defaults.conf
[transport-tcp]
TIMEOUT = 300 s
Modified: gnunet/src/transport/test_transport_startonly.conf
===================================================================
--- gnunet/src/transport/test_transport_startonly.conf 2012-10-09 17:44:43 UTC
(rev 24236)
+++ gnunet/src/transport/test_transport_startonly.conf 2012-10-09 18:38:01 UTC
(rev 24237)
@@ -1,6 +1,5 @@
@INLINE@ test_transport_defaults.conf
[PATHS]
-DEFAULTCONFIG = test_transport_api_data.conf
[arm]
DEFAULTSERVICES = transport
Modified: gnunet/src/transport/transport.conf.in
===================================================================
--- gnunet/src/transport/transport.conf.in 2012-10-09 17:44:43 UTC (rev
24236)
+++ gnunet/src/transport/transport.conf.in 2012-10-09 18:38:01 UTC (rev
24237)
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 2091
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-transport
#PREFIX = valgrind
NEIGHBOUR_LIMIT = 50
Modified: gnunet/src/util/resolver.conf.in
===================================================================
--- gnunet/src/util/resolver.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/util/resolver.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@address@hidden = 2089
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-resolver
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
Modified: gnunet/src/util/util.conf
===================================================================
--- gnunet/src/util/util.conf 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/util/util.conf 2012-10-09 18:38:01 UTC (rev 24237)
@@ -1,8 +1,6 @@
[PATHS]
SERVICEHOME = ~/.gnunet/
# SERVICEHOME = /var/lib/gnunet/
-# DEFAULTCONFIG = /etc/gnunet.conf
-# If 'DEFAULTCONFIG' is not defined, the current
# configuration file is assumed to be the default,
# which is what we want by default...
Modified: gnunet/src/vpn/vpn.conf.in
===================================================================
--- gnunet/src/vpn/vpn.conf.in 2012-10-09 17:44:43 UTC (rev 24236)
+++ gnunet/src/vpn/vpn.conf.in 2012-10-09 18:38:01 UTC (rev 24237)
@@ -3,7 +3,6 @@
@UNIXONLY@ PORT = 0
HOSTNAME = localhost
HOME = $SERVICEHOME
-CONFIG = $DEFAULTCONFIG
BINARY = gnunet-service-vpn
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24237 - in gnunet/src: arm ats ats-test chat core datastore dht dns dv exit fs gns hostlist integration-tests/confs lockmanager mesh namestore nat nse peerinfo pt regex statistics stream template testbed testing testing_old topology transport util vpn,
gnunet <=