From c498cd0d45cff62ff252cdeaf2a46c58c118f0e8 Mon Sep 17 00:00:00 2001 From: Maximilian Szengel Date: Mon, 5 Nov 2012 14:33:16 +0000 Subject: Moving regex profiler config to contrib --- contrib/regex_profiler_infiniband.conf | 99 ++++++++++++++++++++++++++++++++++ src/mesh/Makefile.am | 3 +- src/mesh/regex_profiler_test.conf | 99 ---------------------------------- 3 files changed, 100 insertions(+), 101 deletions(-) create mode 100644 contrib/regex_profiler_infiniband.conf delete mode 100644 src/mesh/regex_profiler_test.conf diff --git a/contrib/regex_profiler_infiniband.conf b/contrib/regex_profiler_infiniband.conf new file mode 100644 index 000000000..f5547328d --- /dev/null +++ b/contrib/regex_profiler_infiniband.conf @@ -0,0 +1,99 @@ +[testbed] +AUTOSTART = NO +PORT = 11999 +ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; +HOSTNAME = localhost +MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10 +MAX_PARALLEL_OPERATIONS = 1000 +MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 +MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 50 + +[regexprofiler] +AUTOSTART = YES +PORT = 12000 +BINARY = /home/szengel/gnunet/src/mesh/gnunet-service-regexprofiler + +[mesh] +AUTOSTART = YES +ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; +APP_ANNOUNCE_TIME = 10 s +ID_ANNOUNCE_TIME = 10 s +CONNECT_TIMEOUT = 10 m +PORT = 12001 + +[dht] +AUTOSTART = YES +ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; +PORT = 12002 +HOSTNAME = localhost +DISABLE_TRY_CONNECT = YES + +[arm] +DEFAULTSERVICES = core mesh dht statistics regexprofiler +PORT = 12003 + +[fs] +AUTOSTART = NO + +[resolver] +AUTOSTART = NO + +[block] +plugins = dht mesh + +[transport] +AUTOSTART = YES +PLUGINS = udp +ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; +ACCEPT_FROM6 = ::1; +NEIGHBOUR_LIMIT = 50 +PORT = 12004 + +[ats] +WAN_QUOTA_OUT = 3932160 +WAN_QUOTA_IN = 3932160 + +[core] +PORT = 12005 +AUTOSTART = YES + +[transport-tcp] +TIMEOUT = 300 s +PORT = 12006 +ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; + +[transport-udp] +TIMEOUT = 300 s +PORT = 12007 +ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; + +[statistics] +PORT = 12008 +AUTOSTART = YES +ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; + +[TESTING] +NUM_PEERS = 5 +WEAKRANDOM = YES +HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat +MAX_CONCURRENT_SSH = 10 +USE_PROGRESSBARS = YES +PEERGROUP_TIMEOUT = 2400 s + +[gnunetd] +HOSTKEY = $SERVICEHOME/.hostkey + +[PATHS] +SERVICEHOME = /tmp/test-testbed/ + +[dns] +AUTOSTART = NO + +[nse] +AUTOSTART = NO + +[vpn] +AUTOSTART = NO + +[nat] +RETURN_LOCAL_ADDRESSES = YES diff --git a/src/mesh/Makefile.am b/src/mesh/Makefile.am index f91ce9c15..cf008d43b 100644 --- a/src/mesh/Makefile.am +++ b/src/mesh/Makefile.am @@ -340,5 +340,4 @@ endif EXTRA_DIST = \ test_mesh.conf \ test_mesh_2dtorus.conf \ - test_mesh_small.conf \ - regex_profiler_test.conf + test_mesh_small.conf diff --git a/src/mesh/regex_profiler_test.conf b/src/mesh/regex_profiler_test.conf deleted file mode 100644 index f5547328d..000000000 --- a/src/mesh/regex_profiler_test.conf +++ /dev/null @@ -1,99 +0,0 @@ -[testbed] -AUTOSTART = NO -PORT = 11999 -ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; -HOSTNAME = localhost -MAX_PARALLEL_OVERLAY_CONNECT_OPERATIONS = 10 -MAX_PARALLEL_OPERATIONS = 1000 -MAX_PARALLEL_SERVICE_CONNECTIONS = 1000 -MAX_PARALLEL_TOPOLOGY_CONFIG_OPERATIONS = 50 - -[regexprofiler] -AUTOSTART = YES -PORT = 12000 -BINARY = /home/szengel/gnunet/src/mesh/gnunet-service-regexprofiler - -[mesh] -AUTOSTART = YES -ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; -APP_ANNOUNCE_TIME = 10 s -ID_ANNOUNCE_TIME = 10 s -CONNECT_TIMEOUT = 10 m -PORT = 12001 - -[dht] -AUTOSTART = YES -ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; -PORT = 12002 -HOSTNAME = localhost -DISABLE_TRY_CONNECT = YES - -[arm] -DEFAULTSERVICES = core mesh dht statistics regexprofiler -PORT = 12003 - -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[block] -plugins = dht mesh - -[transport] -AUTOSTART = YES -PLUGINS = udp -ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; -ACCEPT_FROM6 = ::1; -NEIGHBOUR_LIMIT = 50 -PORT = 12004 - -[ats] -WAN_QUOTA_OUT = 3932160 -WAN_QUOTA_IN = 3932160 - -[core] -PORT = 12005 -AUTOSTART = YES - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12006 -ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; - -[transport-udp] -TIMEOUT = 300 s -PORT = 12007 -ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; - -[statistics] -PORT = 12008 -AUTOSTART = YES -ACCEPT_FROM = 127.0.0.1; 192.168.1.0/24; - -[TESTING] -NUM_PEERS = 5 -WEAKRANDOM = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat -MAX_CONCURRENT_SSH = 10 -USE_PROGRESSBARS = YES -PEERGROUP_TIMEOUT = 2400 s - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -SERVICEHOME = /tmp/test-testbed/ - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[nat] -RETURN_LOCAL_ADDRESSES = YES -- cgit v1.2.3