1485

1 files changed, 9 insertions, 2 deletions

diff --git a/wrapper.config b/wrapper.config
index 8e4690f939fb..1f291ef1ce65 100644
--- a/wrapper.config
+++ b/wrapper.config
@@ -29,6 +29,10 @@ wrapper.java.additional.3=-Djava.net.preferIPv4Stack=true
 #wrapper.java.additional.4=-enableassertions:freenet
 # You might want to set the following line if you have changed java.maxmemory
 # wrapper.java.additional.5=-XX:MaxPermSize=
+# Use nss for crypto operations
+wrapper.java.additional.6=-Dfreenet.jce.use.NSS=true
+# Location used to hold temporary files.
+wrapper.java.additional.7=-Djava.io.tmpdir=/opt/freenet/tmp
 
 # Initial Java Heap Size (in MB)
 # If a non-zero value is specified for this property then an appropriate -Xms
@@ -101,8 +105,8 @@ wrapper.on_exit.4=RESTART
 # hard restart
 wrapper.on_exit.5=RESTART
 
-# the router may take a few seconds to save state, etc
-wrapper.jvm_exit.timeout=60
+# the router may take a few minutes to save state, etc
+wrapper.jvm_exit.timeout=120
 
 # give the OS 60s to clear all the old sockets / etc before restarting
 # Let's change the default from 60 to 10 seconds and see if anyone moans..
@@ -142,6 +146,9 @@ wrapper.filter.trigger.1=java.lang.OutOfMemoryError
 wrapper.filter.action.1=RESTART
 wrapper.filter.message.1=The JVM has run out of memory.
 
+# Request a Thread Dump in the event that the JVM does not exit when requested.
+#wrapper.request_thread_dump_on_failed_jvm_exit=TRUE
+
 #********************************************************************
 # Advanced Options
 #********************************************************************