From: Martin Schanzenbach Date: Tue, 3 Apr 2012 12:40:21 +0000 (+0000) Subject: -config cleanup and fixes X-Git-Tag: initial-import-from-subversion-38251~14010 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cdfa1eccb82e25b2ff117fb11876302c8aace8cc;p=oweals%2Fgnunet.git -config cleanup and fixes --- diff --git a/src/gns/test_gns_defaults.conf b/src/gns/test_gns_defaults.conf deleted file mode 100644 index 762c9641b..000000000 --- a/src/gns/test_gns_defaults.conf +++ /dev/null @@ -1,75 +0,0 @@ -[PATHS] -SERVICEHOME = /tmp/test-gnunet-testing/ -DEFAULTCONFIG = test_testing_defaults.conf - -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 -BINDTO = 127.0.0.1 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 - -[testing] -NUM_PEERS = 5 -WEAKRANDOM = YES -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[nat] -DISABLEV6 = YES -ENABLE_UPNP = NO -BEHIND_NAT = NO -ALLOW_NAT = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 -USE_LOCALADDR = NO - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[fs] -AUTOSTART = NO - -[dv] -AUTOSTART = NO - -[chat] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[gns] -AUTOSTART = NO - -[namestore] -AUTOSTART = NO \ No newline at end of file diff --git a/src/gns/test_gns_dht_alice.conf b/src/gns/test_gns_dht_alice.conf deleted file mode 100644 index 98f176796..000000000 --- a/src/gns/test_gns_dht_alice.conf +++ /dev/null @@ -1,92 +0,0 @@ -@INLINE@ test_gns_defaults.conf -[PATHS] -SERVICEHOME = /tmp/test-gnunet-gns-alice/ -DEFAULTCONFIG = test_gns_dht_alice.conf - -[transport-tcp] -PORT = 32568 - -[dht] -UNIXPATH = /tmp/gnunet-alice-service-dht.sock -DEBUG = NO -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -PORT = 2101 -BINARY = gnunet-service-dht - -[block] -plugins = dht test gns - -[dhtcache] -QUOTA = 1 MB -DATABASE = sqlite - -[arm] -PORT = 12566 -DEFAULTSERVICES = core namstore gns -UNIXPATH = /tmp/gnunet-alice-service-arm.sock - -[statistics] -PORT = 12567 -UNIXPATH = /tmp/gnunet-alice-service-statistics.sock - -[resolver] -PORT = 12564 -UNIXPATH = /tmp/gnunet-alice-service-resolver.sock - -[peerinfo] -PORT = 12569 -UNIXPATH = /tmp/gnunet-alice-service-peerinfo.sock - -[transport] -PORT = 12565 -UNIXPATH = /tmp/gnunet-alice-service-transport.sock - -[core] -PORT = 12570 -UNIXPATH = /tmp/gnunet-alice-service-core.sock - -[ats] -PORT = 12571 -UNIXPATH = /tmp/gnunet-alice-service-ats.sock - -[dns] -UNIXPATH = /tmp/gnunet-alice-service-dns.sock -PORT = 12369 -AUTOSTART = YES -DNS_EXIT = 8.8.8.8 - -[gns] -PORT = 12370 -#PREFIX = valgrind -v --leak-check=full --track-origins=yes. -AUTOSTART = YES -BINARY = gnunet-service-gns -ZONEKEY = testkeys/KAILNI4SSH8M6QR6S8QRSGBBLMA8377HL6F60TEMO7S7TT1OR8CG.zkey -HIJACK_DNS = YES -UNIXPATH = /tmp/gnunet-service-gns-alice.sock -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -AUTO_IMPORT_PKEY = NO -MAX_PARALLEL_BACKGROUND_QUERIES = 10 -DEFAULT_LOOKUP_TIMEOUT = 60 - -[namestore] -PORT = 12371 -AUTOSTART = YES -UNIXPATH = /tmp/gnunet-service-namestore-alice.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-namestore -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -DATABASE = sqlite -ZONEFILE_DIRECTORY = testkeys/ - -[namestore-sqlite] -FILENAME = testdb/sqlite-alice.db - diff --git a/src/gns/test_gns_dht_bob.conf b/src/gns/test_gns_dht_bob.conf deleted file mode 100644 index 72dc21a10..000000000 --- a/src/gns/test_gns_dht_bob.conf +++ /dev/null @@ -1,92 +0,0 @@ -@INLINE@ test_gns_defaults.conf -[PATHS] -SERVICEHOME = /tmp/test-gnunet-gns-bob/ -DEFAULTCONFIG = test_gns_dht_bob.conf - -[transport-tcp] -PORT = 22568 - -[dht] -UNIXPATH = /tmp/gnunet-bob-service-dht.sock -DEBUG = NO -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -PORT = 2102 -BINARY = gnunet-service-dht - -[block] -plugins = dht test gns - -[dhtcache] -QUOTA = 1 MB -DATABASE = sqlite - -[arm] -PORT = 22566 -DEFAULTSERVICES = core namestore gns -UNIXPATH = /tmp/gnunet-bob-service-arm.sock - -[statistics] -PORT = 22567 -UNIXPATH = /tmp/gnunet-bob-service-statistics.sock - -[resolver] -PORT = 22564 -UNIXPATH = /tmp/gnunet-bob-service-resolver.sock - -[peerinfo] -PORT = 22569 -UNIXPATH = /tmp/gnunet-bob-service-peerinfo.sock - -[transport] -PORT = 22565 -UNIXPATH = /tmp/gnunet-bob-service-transport.sock - -[core] -PORT = 22570 -UNIXPATH = /tmp/gnunet-bob-service-core.sock - -[ats] -PORT = 22571 -UNIXPATH = /tmp/gnunet-bob-service-ats.sock - -[dns] -UNIXPATH = /tmp/gnunet-bob-service-dns.sock -PORT = 22369 -AUTOSTART = YES -DNS_EXIT = 8.8.8.8 - -[gns] -PORT = 22370 -#PREFIX = valgrind -v --leak-check=full --track-origins=yes. -AUTOSTART = YES -BINARY = gnunet-service-gns -ZONEKEY = testkeys/KRPVFMVBFKEGUS6KL8SFPEUMORFPP9ERE6AC98KO9NADBMPF7TOG.zkey -HIJACK_DNS = NO -UNIXPATH = /tmp/gnunet-service-gns-bob.sock -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -AUTO_IMPORT_PKEY = NO -MAX_PARALLEL_BACKGROUND_QUERIES = 10 -DEFAULT_LOOKUP_TIMEOUT = 5 - -[namestore] -PORT = 22371 -AUTOSTART = YES -UNIXPATH = /tmp/gnunet-service-namestore-bob.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-namestore -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -DATABASE = sqlite -ZONEFILE_DIRECTORY = testkeys/ - -[namestore-sqlite] -FILENAME = testdb/sqlite-bob.db - diff --git a/src/gns/test_gns_dht_dave.conf b/src/gns/test_gns_dht_dave.conf deleted file mode 100644 index 5f0b20a8c..000000000 --- a/src/gns/test_gns_dht_dave.conf +++ /dev/null @@ -1,92 +0,0 @@ -@INLINE@ test_gns_defaults.conf -[PATHS] -SERVICEHOME = /tmp/test-gnunet-gns-dave/ -DEFAULTCONFIG = test_gns_dht_dave.conf - -[transport-tcp] -PORT = 32568 - -[dht] -UNIXPATH = /tmp/gnunet-service-dht-dave.sock -DEBUG = NO -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -PORT = 2103 -BINARY = gnunet-service-dht - -[block] -plugins = dht test gns - -[dhtcache] -QUOTA = 1 MB -DATABASE = sqlite - -[arm] -PORT = 32566 -DEFAULTSERVICES = core namestore gns -UNIXPATH = /tmp/gnunet-dave-service-arm.sock - -[statistics] -PORT = 32567 -UNIXPATH = /tmp/gnunet-dave-service-statistics.sock - -[resolver] -PORT = 32564 -UNIXPATH = /tmp/gnunet-dave-service-resolver.sock - -[peerinfo] -PORT = 32569 -UNIXPATH = /tmp/gnunet-dave-service-peerinfo.sock - -[transport] -PORT = 32565 -UNIXPATH = /tmp/gnunet-dave-service-transport.sock - -[core] -PORT = 32570 -UNIXPATH = /tmp/gnunet-dave-service-core.sock - -[ats] -PORT = 32571 -UNIXPATH = /tmp/gnunet-dave-service-ats.sock - -[dns] -UNIXPATH = /tmp/gnunet-service-dns-dave.sock -PORT = 32369 -AUTOSTART = YES -DNS_EXIT = 8.8.8.8 - -[gns] -PORT = 32370 -#PREFIX = valgrind -v --leak-check=full --track-origins=yes. -AUTOSTART = YES -BINARY = gnunet-service-gns -ZONEKEY = testkeys/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey -HIJACK_DNS = NO -UNIXPATH = /tmp/gnunet-service-gns-dave.sock -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -AUTO_IMPORT_PKEY = NO -MAX_PARALLEL_BACKGROUND_QUERIES = 10 -DEFAULT_LOOKUP_TIMEOUT = 5 - -[namestore] -PORT = 32371 -AUTOSTART = YES -UNIXPATH = /tmp/gnunet-service-namestore-dave.sock -UNIX_MATCH_UID = YES -UNIX_MATCH_GID = YES -HOSTNAME = localhost -HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG -BINARY = gnunet-service-namestore -ACCEPT_FROM = 127.0.0.1; -ACCEPT_FROM6 = ::1; -DATABASE = sqlite -ZONEFILE_DIRECTORY = testkeys/ - -[namestore-sqlite] -FILENAME = testdb/sqlite-dave.db - diff --git a/src/gns/test_gns_simple_lookup.conf b/src/gns/test_gns_simple_lookup.conf index 3c4f14013..b609e03b2 100644 --- a/src/gns/test_gns_simple_lookup.conf +++ b/src/gns/test_gns_simple_lookup.conf @@ -88,3 +88,21 @@ AUTOSTART = NO [statistics] AUTOSTART = NO + +[namestore] +PORT = 22371 +AUTOSTART = YES +UNIXPATH = /tmp/gnunet-service-namestore-default.sock +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES +HOSTNAME = localhost +HOME = $SERVICEHOME +CONFIG = $DEFAULTCONFIG +BINARY = gnunet-service-namestore +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +DATABASE = sqlite +ZONEFILE_DIRECTORY = $SERVICEHOME + +[namestore-sqlite] +FILENAME = $SERVICEHOME/sqlite-default.db diff --git a/src/gns/test_gns_twopeer.conf b/src/gns/test_gns_twopeer.conf deleted file mode 100644 index 40482975b..000000000 --- a/src/gns/test_gns_twopeer.conf +++ /dev/null @@ -1,80 +0,0 @@ -[fs] -AUTOSTART = NO - -[resolver] -AUTOSTART = NO - -[dht] -DEBUG = NO -AUTOSTART = YES -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -HOSTNAME = localhost -PORT = 2100 -BINARY = gnunet-service-dht - -[block] -plugins = dht test gns - -[dhtcache] -QUOTA = 1 MB -DATABASE = sqlite - -[transport] -PLUGINS = tcp -DEBUG = NO -ACCEPT_FROM6 = ::1; -ACCEPT_FROM = 127.0.0.1; -NEIGHBOUR_LIMIT = 50 -PORT = 12365 - -[ats] -WAN_QUOTA_IN = 1 GB -WAN_QUOTA_OUT = 1 GB - -[core] -PORT = 12092 - -[arm] -DEFAULTSERVICES = core -PORT = 12366 -DEBUG = NO - -[transport-tcp] -TIMEOUT = 300 s -PORT = 12368 -BINDTO = 127.0.0.1 - -[TESTING] -WEAKRANDOM = YES - -[gnunetd] -HOSTKEY = $SERVICEHOME/.hostkey - -[PATHS] -DEFAULTCONFIG = gns.conf -SERVICEHOME = /tmp/test-gnunetd-gns-peer-1/ - - -[nat] -DISABLEV6 = YES -ENABLE_UPNP = NO -BEHIND_NAT = NO -ALLOW_NAT = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 -USE_LOCALADDR = NO - -[dns] -AUTOSTART = YES - -[gns] -AUTOSTART = YES -BINARY = gnunet-service-gns -ZONEKEY = /tmp/alicekey - - -[nse] -AUTOSTART = NO - -