summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbin/rename.sh2
-rw-r--r--src/arm/arm.conf.in2
-rw-r--r--src/testbed/test_testbed_api_barriers.conf.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/bin/rename.sh b/bin/rename.sh
index 4234b8316..3b49712e5 100755
--- a/bin/rename.sh
+++ b/bin/rename.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"`
+for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"` `find * -name "*.conf.in"`
do
cat $n | sed -e "s/$1/$2/g" > $n.new
mv $n.new $n || echo "Move failed: $n.new to $n"
diff --git a/src/arm/arm.conf.in b/src/arm/arm.conf.in
index 27b613c3d..83582659a 100644
--- a/src/arm/arm.conf.in
+++ b/src/arm/arm.conf.in
@@ -5,7 +5,7 @@ HOSTNAME = localhost
BINARY = gnunet-service-arm
ACCEPT_FROM = 127.0.0.1;
ACCEPT_FROM6 = ::1;
-DEFAULTSERVICES = topology hostlist dht nse mesh fs revocation
+DEFAULTSERVICES = topology hostlist dht nse cadet fs revocation
# Special case, uses user runtime dir even for per-system service.
UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
UNIX_MATCH_UID = YES
diff --git a/src/testbed/test_testbed_api_barriers.conf.in b/src/testbed/test_testbed_api_barriers.conf.in
index 5fbfd0b8d..889a4ab4f 100644
--- a/src/testbed/test_testbed_api_barriers.conf.in
+++ b/src/testbed/test_testbed_api_barriers.conf.in
@@ -22,7 +22,7 @@ AUTOSTART = NO
HOSTNAME = localhost
AUTOSTART = NO
-[mesh]
+[cadet]
AUTOSTART = NO
[dht]