From c426a65ef53f47f8dacaa93196a39fca9aafa0ef Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Thu, 17 Mar 2016 11:08:12 +0100
Subject: [PATCH] Startup

---
 config/config.properties  |  8 ++------
 config/config.properties~ | 31 +++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 config/config.properties~

diff --git a/config/config.properties b/config/config.properties
index cce04e2e..202ce64d 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,16 +1,12 @@
-#Thu Mar 17 11:03:17 CET 2016
-autoSaveScanData=true
+#Thu Mar 17 11:07:48 CET 2016
+autoSaveScanData=false
 createSessionFiles=false
-dataFile={data}/{year}_{month}/{date}/{date}_{time}_{context}
-dataFilesCreation=true
 dataLayout=default
 dataPath={data}/{year}/{month}/pshell-{date}-{time}-{name}
 dataProvider=default
 dataScanFlushRecords=false
-dataScanStrategy=default
 devicePoolFile={config}/devices.properties
 deviceUpdateStrategyFile={config}/update.properties
-imageSourcesFile={config}/imaging.properties
 logDaysToLive=-1
 logLevel=Info
 logLevelConsole=Off
diff --git a/config/config.properties~ b/config/config.properties~
new file mode 100644
index 00000000..cce04e2e
--- /dev/null
+++ b/config/config.properties~
@@ -0,0 +1,31 @@
+#Thu Mar 17 11:03:17 CET 2016
+autoSaveScanData=true
+createSessionFiles=false
+dataFile={data}/{year}_{month}/{date}/{date}_{time}_{context}
+dataFilesCreation=true
+dataLayout=default
+dataPath={data}/{year}/{month}/pshell-{date}-{time}-{name}
+dataProvider=default
+dataScanFlushRecords=false
+dataScanStrategy=default
+devicePoolFile={config}/devices.properties
+deviceUpdateStrategyFile={config}/update.properties
+imageSourcesFile={config}/imaging.properties
+logDaysToLive=-1
+logLevel=Info
+logLevelConsole=Off
+logPath={logs}/{date}_{time}
+scanStreamingPort=-1
+scriptType=py
+serverEnabled=false
+serverPort=8080
+simulation=false
+tasksFile={config}/tasks.properties
+terminalEnabled=true
+terminalPort=3579
+userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
+userManagement=false
+versionTrackingEnabled=true
+versionTrackingLogin=
+versionTrackingManual=false
+versionTrackingRemote=https\://git.psi.ch/pshell_config/x03da.git