[gnunet] 90/90: Merge branch 'dev/willow/gnunet_temp_sh_py'

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit baea2e9c420475098e64cc199d51564f33b767c7
Merge: c9562b8cf 43b55e25e
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Oct 18 10:05:37 2022 +0900

    Merge branch 'dev/willow/gnunet_temp_sh_py'

 src/dht/dhtu_testbed_connect.sh                  |  8 +++++---
 src/dht/dhtu_testbed_deploy.conf                 |  2 +-
 src/dht/dhtu_testbed_deploy.sh                   | 11 +++++++----
 src/dht/test_dht_tools.sh                        |  5 +++--
 src/gns/test_dns2gns.conf                        |  2 +-
 src/gns/test_gns_lookup.conf                     |  2 +-
 src/gns/test_gns_lookup_peer1.conf               |  2 +-
 src/gns/test_gns_lookup_peer2.conf               |  2 +-
 src/gns/test_gns_proxy.conf                      |  2 +-
 src/gns/test_proxy.sh                            | 17 ++++++++++-------
 src/statistics/test_gnunet_statistics.py.in      | 13 +++++++++++--
 src/transport/test_transport_api2_tcp_node1.conf |  6 +++---
 src/transport/test_transport_api2_tcp_node2.conf |  4 ++--
 src/transport/test_transport_api2_tcp_peer1.conf |  4 ++--
 src/transport/test_transport_api2_tcp_peer2.conf |  4 ++--
 15 files changed, 51 insertions(+), 33 deletions(-)

diff --cc src/gns/test_gns_lookup.conf
index fe7970018,01f94cf2d..322af0784
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@@ -20,19 -20,8 +20,19 @@@ ZONE_PUBLISH_TIME_WINDOW = 1 
  DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
  
  [namestore]
- #PREFIX = valgrind --leak-check=full --track-origins=yes 
--log-file=/tmp/ns_log
+ #PREFIX = valgrind --leak-check=full --track-origins=yes 
--log-file=$GNUNET_TMP/ns_log
  
 +[zonemaster-monitor]
 +IMMEDIATE_START = YES
 +START_ON_DEMAND = YES
 +
 +[zonemaster]
 +IMMEDIATE_START = YES
 +START_ON_DEMAND = YES
 +
 +[rest]
 +BASIC_AUTH_ENABLED=NO
 +
  [revocation]
  WORKBITS = 2
  EPOCH_DURATION = 365 d
diff --cc src/gns/test_gns_proxy.conf
index c87f26d40,db6cb6a4c..3dfeacafe
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@@ -13,18 -13,9 +13,18 @@@ RECORD_PUT_INTERVAL = 1 
  ZONE_PUBLISH_TIME_WINDOW = 1 h
  DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
  
 +[zonemaster-monitor]
 +IMMEDIATE_START = YES
 +START_ON_DEMAND = YES
 +
 +[zonemaster]
 +IMMEDIATE_START = YES
 +START_ON_DEMAND = YES
 +
 +
  
  [gns-proxy]
- PROXY_CACERT = /tmp/proxy_cacert.pem
+ PROXY_CACERT = $GNUNET_TMP/proxy_cacert.pem
  PROXY_UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-gns-proxy.sock
  
  [namestore]

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.