diff options
author | Bart Polot <bart@net.in.tum.de> | 2014-05-07 13:00:40 +0000 |
---|---|---|
committer | Bart Polot <bart@net.in.tum.de> | 2014-05-07 13:00:40 +0000 |
commit | f845f5cdece28a41fad692e2839b398393d205e8 (patch) | |
tree | 3ed9b8d73e6ebd01ff4331f9b954c8c183cc15d3 | |
parent | 4070540a5c063d24cdbb793ebd2fa985c7c507f7 (diff) | |
download | gnunet-f845f5cdece28a41fad692e2839b398393d205e8.tar.gz gnunet-f845f5cdece28a41fad692e2839b398393d205e8.zip |
- rename in conf.in files, update conf.in file still referencing mesh
-rwxr-xr-x | bin/rename.sh | 2 | ||||
-rw-r--r-- | src/arm/arm.conf.in | 2 | ||||
-rw-r--r-- | src/testbed/test_testbed_api_barriers.conf.in | 2 |
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 |
2 | for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"` | 2 | for n in `find * -name "*.c"` `find * -name "*.h"` `find * -name "*.am"` `find * -name "*.conf"` `find * -name "*.conf.in"` |
3 | do | 3 | do |
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 | |||
5 | BINARY = gnunet-service-arm | 5 | BINARY = gnunet-service-arm |
6 | ACCEPT_FROM = 127.0.0.1; | 6 | ACCEPT_FROM = 127.0.0.1; |
7 | ACCEPT_FROM6 = ::1; | 7 | ACCEPT_FROM6 = ::1; |
8 | DEFAULTSERVICES = topology hostlist dht nse mesh fs revocation | 8 | DEFAULTSERVICES = 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. |
10 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock | 10 | UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-arm.sock |
11 | UNIX_MATCH_UID = YES | 11 | 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 | |||
22 | HOSTNAME = localhost | 22 | HOSTNAME = localhost |
23 | AUTOSTART = NO | 23 | AUTOSTART = NO |
24 | 24 | ||
25 | [mesh] | 25 | [cadet] |
26 | AUTOSTART = NO | 26 | AUTOSTART = NO |
27 | 27 | ||
28 | [dht] | 28 | [dht] |