aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Polot <bart@net.in.tum.de>2014-05-07 13:00:40 +0000
committerBart Polot <bart@net.in.tum.de>2014-05-07 13:00:40 +0000
commitf845f5cdece28a41fad692e2839b398393d205e8 (patch)
tree3ed9b8d73e6ebd01ff4331f9b954c8c183cc15d3
parent4070540a5c063d24cdbb793ebd2fa985c7c507f7 (diff)
downloadgnunet-f845f5cdece28a41fad692e2839b398393d205e8.tar.gz
gnunet-f845f5cdece28a41fad692e2839b398393d205e8.zip
- rename in conf.in files, update conf.in file still referencing mesh
-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 @@
1#!/bin/sh 1#!/bin/sh
2for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"` 2for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"` `find * -name "*.conf.in"`
3do 3do
4 cat $n | sed -e "s/$1/$2/g" > $n.new 4 cat $n | sed -e "s/$1/$2/g" > $n.new
5 mv $n.new $n || echo "Move failed: $n.new to $n" 5 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
5BINARY = gnunet-service-arm 5BINARY = gnunet-service-arm
6ACCEPT_FROM = 127.0.0.1; 6ACCEPT_FROM = 127.0.0.1;
7ACCEPT_FROM6 = ::1; 7ACCEPT_FROM6 = ::1;
8DEFAULTSERVICES = topology hostlist dht nse mesh fs revocation 8DEFAULTSERVICES = topology hostlist dht nse cadet fs revocation
9# Special case, uses user runtime dir even for per-system service. 9# Special case, uses user runtime dir even for per-system service.
10UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock 10UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock
11UNIX_MATCH_UID = YES 11UNIX_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
22HOSTNAME = localhost 22HOSTNAME = localhost
23AUTOSTART = NO 23AUTOSTART = NO
24 24
25[mesh] 25[cadet]
26AUTOSTART = NO 26AUTOSTART = NO
27 27
28[dht] 28[dht]