From 4dc43f7be1f6bff258eff748efc0067564e518c1 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Wed, 19 May 2021 14:21:30 +0200
Subject: [PATCH] Startup

---
 config/config.properties | 38 +++++++++++++++++++++++---------------
 config/setup.properties  | 21 ++++++++++++---------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/config/config.properties b/config/config.properties
index 1b468fa5..974f2abd 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,42 +1,50 @@
-#Wed Apr 14 11:48:39 CEST 2021
+#Tue May 11 11:36:45 CEST 2021
+autoSaveScanData=true
+simulation=false
+commandExecutionEvents=false
+logDaysToLive=50
+dataScanSaveOutput=false
+userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
+logLevelConsole=Off
+scanStreamerPort=-1
+dataScanSaveScript=false
+dataScanSaveSetpoints=false
+notifiedTasks=null
+parallelInitialization=false
+dataTransferPath=null
+scanStreamingPort=-1
+saveConsoleSessionFiles=false
+devicePoolFile={config}/devices.properties
+versionTrackingManual=false
+dataTransferMode=null
 hostName=x03da-cons-1
 userManagement=false
 instanceName=x03da
-autoSaveScanData=true
-simulation=false
+disableEmbeddedAttributes=false
 dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
 versionTrackingEnabled=true
 dataPath={data}/{year}/{month}/noei/pshell-{date}-{time}-{name}
 serverEnabled=false
-commandExecutionEvents=false
-logDaysToLive=50
 dataScanReleaseRecords=true
 depthDimension=2
 dataScanPreserveTypes=false
-dataScanSaveOutput=false
 logLevel=Fine
 dataScanFlushRecords=true
 logPath={logs}/{date}_{time}
 dataLayout=default
+disableDataFileLogs=false
+sessionHandling=null
 deviceUpdateStrategyFile={config}/update.properties
 terminalEnabled=true
 notificationLevel=Error
-userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
-logLevelConsole=Off
 terminalPort=3579
 tasksFile={config}/tasks.properties
-scanStreamerPort=-1
-dataScanSaveScript=false
-dataScanSaveSetpoints=false
-parallelInitialization=false
-scanStreamingPort=-1
+dataTransferUser=null
 createSessionFiles=true
 versionTrackingLogin={context}/svcusr-hlapp_robot
-devicePoolFile={config}/devices.properties
 scriptType=py
-versionTrackingManual=false
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x03da.git
 dataProvider=default
 saveCommandStatistics=false
diff --git a/config/setup.properties b/config/setup.properties
index c62464e5..059fe6d8 100644
--- a/config/setup.properties
+++ b/config/setup.properties
@@ -1,22 +1,25 @@
-#Fri Sep 20 17:21:43 CEST 2019
+#Tue May 11 11:36:45 CEST 2021
 scriptPath={home}/script
 sessionsPath={home}/sessions
-configFileImageSources={config}/imaging.properties
-pluginsPath={home}/plugins
 configFileDevices={config}/devices.properties
-libraryPath={script}; {script}/Lib
-configFilePlugins={config}/plugins.properties
-contextPath={home}/context
 extensionsPath={home}/extensions
 configFileUpdateStrategy={config}/update.properties
 configPath={home}/config
+configFileSessions={config}/sessions.properties
+userSessionsPath={sessions}/user
 dataPath=~/Data1
-devicesPath={home}/devices
 configFileVariables={config}/variables.properties
-configFileSettings={config}/settings.properties
 logPath={home}/log
 wwwPath={home}/www
 configFile={config}/config.properties
+configFileTasks={config}/tasks.properties
+configFileImageSources={config}/imaging.properties
+pluginsPath={home}/plugins
+consoleSessionsPath={sessions}/console
+libraryPath={script}; {script}/Lib
+configFilePlugins={config}/plugins.properties
+contextPath={home}/context
+devicesPath={home}/devices
+configFileSettings={config}/settings.properties
 imagesPath={outp}/images
 scriptType=py
-configFileTasks={config}/tasks.properties