4 files changed, 14 insertions, 12 deletions

diff --git a/src/include/gnunet_peerstore_service.h b/src/include/gnunet_peerstore_service.h
index c2d55dd84..ca751af96 100644
--- a/src/include/gnunet_peerstore_service.h
+++ b/src/include/gnunet_peerstore_service.h
@@ -113,7 +113,7 @@ struct GNUNET_PEERSTORE_Record
 typedef void (*GNUNET_PEERSTORE_Continuation)(void *cls, int success);
 
 /**
- * Function called by for each matching record.
+ * Function called by PEERSTORE for each matching record.
  *
  * @param cls closure
  * @param record peerstore record information
diff --git a/src/peerstore/peerstore.conf.in b/src/peerstore/peerstore.conf.in
index ffdbc452f..a6c81858a 100644
--- a/src/peerstore/peerstore.conf.in
+++ b/src/peerstore/peerstore.conf.in
@@ -1,9 +1,9 @@
 [peerstore]
+AUTOSTART = @AUTOSTART@
 BINARY = gnunet-service-peerstore
-UNIXPATH = /tmp/gnunet-service-peerstore.sock
-HOME = $SERVICEHOME
-# PORT = 2106
-@UNIXONLY@ PORT = 2088
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-peerstore.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
 DATABASE = sqlite
 
 [peerstore-sqlite]
diff --git a/src/sensor/sensor.conf.in b/src/sensor/sensor.conf.in
index 92b49100a..a034c6914 100644
--- a/src/sensor/sensor.conf.in
+++ b/src/sensor/sensor.conf.in
@@ -1,13 +1,13 @@
 [sensor]
+AUTOSTART = @AUTOSTART@
 BINARY = gnunet-service-sensor
-UNIXPATH = /tmp/gnunet-service-sensor.sock
-HOME = $SERVICEHOME
-# PORT = 2106
-@UNIXONLY@ PORT = 2087
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-sensor.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
 
 [sensor-analysis]
 model = gaussian
 
 [sensor-model-gaussian]
 TRAINING_WINDOW = 1000
-CONFIDENCE_INTERVAL = 3
\ No newline at end of file
+CONFIDENCE_INTERVAL = 3
diff --git a/src/sensordashboard/sensordashboard.conf.in b/src/sensordashboard/sensordashboard.conf.in
index a375ca676..baf9eba96 100644
--- a/src/sensordashboard/sensordashboard.conf.in
+++ b/src/sensordashboard/sensordashboard.conf.in
@@ -1,4 +1,6 @@
 [sensordashboard]
+AUTOSTART = @AUTOSTART@
 BINARY = gnunet-service-sensordashboard
-UNIXPATH = /tmp/gnunet-service-sensordashboard.sock
-HOME = $SERVICEHOME
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-sensordashboard.sock
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES