-Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

[oweals/gnunet.git] / src / identity / identity.conf.in

diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in
index d06912681720133378823a230080169d0582f1fa..4af3a6261ef0874c8ef3b05fa05127a9cda26e5c 100644 (file)
--- a/src/identity/identity.conf.in
+++ b/src/identity/identity.conf.in
@@ -1,17 +1,17 @@
 [identity]
-AUTOSTART = YES
-@UNIXONLY@PORT = 2108
+AUTOSTART = @AUTOSTART@
+USER_SERVICE = YES
+@JAVAPORT@PORT = 2108
 HOSTNAME = localhost
-HOME = $SERVICEHOME
 BINARY = gnunet-service-identity
 ACCEPT_FROM = 127.0.0.1;
 ACCEPT_FROM6 = ::1;
-UNIXPATH = $SERVICEHOME/gnunet-service-identity.unix
+UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-identity.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
 
 # Directory where we store information about our egos
-EGODIR = $SERVICEHOME/egos/
+EGODIR = $GNUNET_DATA_HOME/identity/egos/
 
 # File where we store default identities for subsystems
-SUBSYSTEM_CFG = $SERVICEHOME/subsystem_defaults.conf
+SUBSYSTEM_CFG = $GNUNET_CONFIG_HOME/identity/subsystem_defaults.conf