Preparation of config files for release

Signed-off-by: Christian Muck <christian.muck@bmw.de>

4 files changed, 18 insertions, 10 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 524ca4f..2fc55f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,8 +51,8 @@ endif(NOT CMAKE_BUILD_TYPE)
 

 # Set of indiviual options

 option(BUILD_SHARED_LIBS      "Set to OFF to build static libraries"                 ON  )

-option(WITH_SYSTEMD           "Set to ON to create unit files and systemd check on dlt-daemon startup"           ON )

-option(WITH_SYSTEMD_WATCHDOG  "Set to ON to use the systemd watchdog in dlt-daemon"      ON)

+option(WITH_SYSTEMD           "Set to ON to create unit files and systemd check on dlt-daemon startup"           OFF )

+option(WITH_SYSTEMD_WATCHDOG  "Set to ON to use the systemd watchdog in dlt-daemon"      OFF)

 option(WITH_DOC               "Set to ON to build documentation target"              OFF )

 option(WITH_MAN               "Set to ON to build man pages"             ON )

 option(WITH_CHECK_CONFIG_FILE "Set to ON to create a configure file of CheckIncludeFiles and CheckFunctionExists " OFF )

diff --git a/src/daemon/dlt.conf b/src/daemon/dlt.conf
index 2e8ba18..c97e8e6 100644
--- a/src/daemon/dlt.conf
+++ b/src/daemon/dlt.conf
@@ -19,7 +19,7 @@
 SendContextRegistration = 1
 
 # Send automatic time packets every second if client is connected (Default: 0)
-SendMessageTime = 0
+# SendMessageTime = 0
 
 # Set ECU ID (Default: ECU1)
 ECUId = ECU1
@@ -46,13 +46,13 @@ LoggingFilename = /tmp/dlt.log
 ########################################################################
 
 # Store DLT messages to local directory, if not set offline Trace is off (Default: off)
-OfflineTraceDirectory = /tmp
+# OfflineTraceDirectory = /tmp
 
 # Maximum size in bytes of one trace file (Default: 1000000)
-OfflineTraceFileSize = 1000000
+# OfflineTraceFileSize = 1000000
 
 # Maximum size of all trace files (Default: 4000000)
-OfflineTraceMaxSize = 4000000
+# OfflineTraceMaxSize = 4000000
 
 ########################################################################
 # Local console output configuration                                   #
@@ -93,5 +93,8 @@ OfflineTraceMaxSize = 4000000
 # ECU Software version info                                            #
 ########################################################################
 
-SendECUSoftwareVersion = 1
-PathToECUSoftwareVersion = /etc/ecu.version
+# Send automatic get ecu version info
+# SendECUSoftwareVersion = 0
+
+# Absolute path to file storing version info - otherwise DLT version is used
+# PathToECUSoftwareVersion = <absolute-path-to-file-needed>
diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c
index c764978..5eef59b 100644
--- a/src/system/dlt-system-watchdog.c
+++ b/src/system/dlt-system-watchdog.c
@@ -40,14 +40,17 @@
 **  TO BE CHANGED BY USER [yes/no]: no                                        **
 **                                                                            **
 *******************************************************************************/
+#if defined(DLT_SYSTEMD_WATCHDOG_ENABLE)
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
 #include <sys/timerfd.h>
 #include "dlt.h"
-#include "sd-daemon.h"
 #include "dlt-system.h"
 
+#include "sd-daemon.h"
+
+
 DLT_DECLARE_CONTEXT(watchdogContext)
 DLT_IMPORT_CONTEXT(dltsystem)
 
@@ -109,6 +112,7 @@ int make_periodic(unsigned int period, PeriodicData *info)
     return timerfd_settime (fd, 0, &itval, NULL);
 }
 
+
 void watchdog_thread(void *v_conf)
 {
 	char str[512];
@@ -195,3 +199,4 @@ void start_systemd_watchdog(DltSystemConfiguration *conf)
 		DLT_LOG(dltsystem, DLT_LOG_ERROR,DLT_STRING("Could not create thread for systemd watchdog\n"));
 	}
 }
+#endif
diff --git a/src/system/dlt-system.conf b/src/system/dlt-system.conf
index ee237a2..c7313eb 100644
--- a/src/system/dlt-system.conf
+++ b/src/system/dlt-system.conf
@@ -13,7 +13,7 @@ ApplicationId = SYS
 ########################################################################
 
 # Enable the Syslog Adapter (Default: 0)
-SyslogEnable = 1
+SyslogEnable = 0
 
 # The Context Id of the syslog adapter (Default: SYSL)
 SyslogContextId = SYSL