moved some system files away from userdata/etc (openhab#364)

Signed-off-by: Kai Kreuzer <[email protected]>
whopperg · Dec 31, 2016 · c3337d8 · c3337d8
1 parent 1343cc5
commit c3337d8
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/...src/main/resources/userdata/etc/jetty.xml → .../src/main/resources/runtime/etc/jetty.xml b/...src/main/resources/userdata/etc/jetty.xml → .../src/main/resources/runtime/etc/jetty.xml
diff --git a/.../resources/userdata/etc/quartz.properties → ...n/resources/runtime/etc/quartz.properties b/.../resources/userdata/etc/quartz.properties → ...n/resources/runtime/etc/quartz.properties
diff --git a/distributions/distribution-resources/src/main/resources/userdata/etc/custom.properties b/distributions/distribution-resources/src/main/resources/userdata/etc/custom.properties
@@ -1,4 +1,9 @@
 karaf.systemBundlesStartLevel = 50
 karaf.framework = equinox
+karaf.lock.dir=${karaf.data}/tmp
+karaf.shutdown.port.file=${karaf.data}/tmp/port
+karaf.pid.file=${karaf.data}/tmp/karaf.pid
+
 osgi.compatibility.bootdelegation = true
+
 felix.fileinstall.dir    = ${karaf.data}/etc
diff --git a/distributions/distribution-resources/src/main/resources/userdata/etc/org.ops4j.pax.web.cfg b/distributions/distribution-resources/src/main/resources/userdata/etc/org.ops4j.pax.web.cfg
@@ -6,12 +6,12 @@ org.ops4j.pax.web.server.minThreads = 2
 #
 # max server threads
 #
-org.ops4j.pax.web.server.maxThreads = 100
+org.ops4j.pax.web.server.maxThreads = 50
 
 #
 # location of jetty config
 #
-org.ops4j.pax.web.config.file = ${openhab.userdata}/etc/jetty.xml
+org.ops4j.pax.web.config.file = ${openhab.runtime}/etc/jetty.xml
 
 #
 # enable https

diff --git a/distributions/distribution-resources/src/main/resources/userdata/etc/system.properties b/distributions/distribution-resources/src/main/resources/userdata/etc/system.properties
@@ -135,7 +135,7 @@ smarthome.servicepid=org.openhab
 smarthome.servicecfg=${openhab.runtime}/services.cfg
 smarthome.userdata=${openhab.userdata}
 smarthome.configdir=${openhab.conf}
-org.quartz.properties=${openhab.userdata}/etc/quartz.properties
+org.quartz.properties=${openhab.runtime}/etc/quartz.properties
 jetty.keystore.path=${openhab.userdata}/etc/keystore
 jetty.truststore.path=${openhab.userdata}/etc/keystore
 equinox.ds.block_timeout=240000