1 files changed, 3 insertions, 3 deletions
diff --git a/src/messenger/messenger.conf.in b/src/messenger/messenger.conf.in
index 6b54550ea..ef0544681 100644
--- a/src/messenger/messenger.conf.in
+++ b/src/messenger/messenger.conf.in
@@ -1,12 +1,12 @@
 [messenger]
-START_ON_DEMAND = YES
+START_ON_DEMAND = @START_ON_DEMAND@
 RUN_PER_USER = YES
-PORT = 2097
+@JAVAPORT@PORT = 2125
 HOSTNAME = localhost
 BINARY = gnunet-service-messenger
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-messenger.sock
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-messenger.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES

diff --git a/src/messenger/messenger.conf.in b/src/messenger/messenger.conf.in index 6b54550ea..ef0544681 100644 --- a/src/messenger/messenger.conf.in +++ b/src/messenger/messenger.conf.in
@@ -1,12 +1,12 @@
1	[messenger]	1	[messenger]
2	START_ON_DEMAND = YES	2	START_ON_DEMAND = @START_ON_DEMAND@
3	RUN_PER_USER = YES	3	RUN_PER_USER = YES
4	PORT = 2097	4	@JAVAPORT@PORT = 2125
5	HOSTNAME = localhost	5	HOSTNAME = localhost
6	BINARY = gnunet-service-messenger	6	BINARY = gnunet-service-messenger
7	ACCEPT_FROM = 127.0.0.1;	7	ACCEPT_FROM = 127.0.0.1;
8	ACCEPT_FROM6 = ::1;	8	ACCEPT_FROM6 = ::1;
9	UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-messenger.sock	9	UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-messenger.sock
10	UNIX_MATCH_UID = NO	10	UNIX_MATCH_UID = NO
11	UNIX_MATCH_GID = YES	11	UNIX_MATCH_GID = YES
12		12