From 01c1b497de4d3df771b529e567b8931ad3cd6c6e Mon Sep 17 00:00:00 2001
From: gac-x04sa <gac-x04sa@x04sa-cons-2.psi.ch>
Date: Tue, 10 Dec 2019 11:25:41 +0100
Subject: [PATCH] Startup

---
 config/config.properties   | 55 +++++++++++++++++++-------------------
 config/settings.properties |  2 +-
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/config/config.properties b/config/config.properties
index 4458a4e..523cd31 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,33 +1,34 @@
-#Wed Jul 31 10:34:23 CEST 2019
-autoSaveScanData=true
-commandExecutionEvents=false
-createSessionFiles=false
-dataLayout=default
-dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
-dataProvider=h5
-dataScanFlushRecords=false
-dataScanPreserveTypes=false
-dataScanReleaseRecords=false
-dataServerPort=-1
-depthDimension=0
-hideServerMessages=false
+#Tue Nov 26 09:57:38 CET 2019
 hostName=null
-instanceName=ES3
-logDaysToLive=-1
-logLevel=Info
-logLevelConsole=Off
-logPath={logs}/{date}_{time}
-notificationLevel=Off
-saveCommandStatistics=false
-scanStreamerPort=-1
-serverEnabled=false
-serverPort=8080
-simulation=false
-terminalEnabled=false
-terminalPort=3579
-userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
 userManagement=true
+instanceName=ES3
+autoSaveScanData=true
+simulation=false
+dataServerPort=-1
+hideServerMessages=false
+serverPort=8080
 versionTrackingEnabled=true
+dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
+serverEnabled=false
+commandExecutionEvents=false
+logDaysToLive=-1
+dataScanReleaseRecords=false
+depthDimension=0
+dataScanPreserveTypes=false
+logLevel=Info
+dataScanFlushRecords=false
+logPath={logs}/{date}_{time}
+dataLayout=default
+terminalEnabled=false
+notificationLevel=Off
+userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
+logLevelConsole=Off
+terminalPort=3579
+scanStreamerPort=-1
+parallelInitialization=false
+createSessionFiles=false
 versionTrackingLogin={context}/svcusr-hlapp_robot
 versionTrackingManual=false
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x04sa-es3.git
+dataProvider=h5
+saveCommandStatistics=false
diff --git a/config/settings.properties b/config/settings.properties
index b662529..ad1cb8f 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,4 +1,4 @@
-#Tue Oct 22 09:56:32 CEST 2019
+#Tue Dec 10 11:25:20 CET 2019
 count_time=1
 data_root=/sls/X04SA/data/x04sa/ES3/expdata
 user_path=../../expdata/pshell_development