Merge pull request #20 from xeon22/develop

Updates for Stash 2.9.4

Author: bflad

attributes/default.rb

@@ -45,6 +45,8 @@
 when '2.9.0' then '5638c1af3008379d26fcb70dd392db5149a6b1b969ec5b9334647ba01c71c74b'
 when '2.9.1' then 'fe57c0a483ecd967307080b157c7af42260c59e48a919784b346eb496c283386'
 when '2.9.2' then 'd4c31a0523ab4df5d12a8dcd24778cfd9db343f668bee1f4a0b18381d173088c'
+when '2.9.3' then '6d866a2081f0a69fdd29dc059836f1d3d1bb51453bc7cbc6c9518ebc3227a389'
+when '2.9.4' then '3425e39eb5dbffe24cf44558eaca38d0884b8d07602c3225c9215007ae13bef3'
 end
 
 default['stash']['apache2']['access_log']         = ''

templates/default/setenv.sh.erb

@@ -9,10 +9,19 @@
 #
 STASH_HOME="<%= node['stash']['home_path'] %>"
 
+#
+# Native libraries, such as the Tomcat native library, can be placed here for use by Stash. Alternatively, native
+# libraries can also be placed in $STASH_HOME/lib/native, where they will also be included in the library path used
+# by the JVM. By placing libraries in $STASH_HOME, they can be preserved across Stash upgrades.
+#
+# NOTE: You must choose the library architecture, x86 or x64, based on the JVM you'll be running, _not_ based on the OS.
+#
+JVM_LIBRARY_PATH="$CATALINA_HOME/lib/native:$STASH_HOME/lib/native"
+
 #
 # Occasionally Atlassian Support may recommend that you set some specific JVM arguments.  You can use this variable
 # below to do that.
-#
+
 JVM_SUPPORT_RECOMMENDED_ARGS="<%= node['stash']['jvm']['support_args'] %>"
 
 #
@@ -30,7 +39,7 @@ JVM_FILE_ENCODING="UTF-8"
 #
 # The following are the required arguments needed for Atlassian Stash.
 #
-JVM_REQUIRED_ARGS="-Djava.awt.headless=true -Dfile.encoding=${JVM_FILE_ENCODING} -Datlassian.standalone=STASH -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dmail.mime.decodeparameters=true  -Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false"
+JVM_REQUIRED_ARGS="-Djava.awt.headless=true -Dfile.encoding=${JVM_FILE_ENCODING} -Datlassian.standalone=STASH -Dorg.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true -Dmail.mime.decodeparameters=true -Dorg.apache.catalina.connector.Response.ENFORCE_ENCODING_IN_GET_WRITER=false"
 
 #
 # Additional JVM arguments
@@ -70,6 +79,11 @@ fi
 
 STASH_HOME_MINUSD=-Dstash.home=$STASH_HOME
 
+if [ "$JVM_LIBRARY_PATH" != "" ]; then
+    JVM_LIBRARY_PATH_MINUSD=-Djava.library.path=$JVM_LIBRARY_PATH
+    JVM_REQUIRED_ARGS="${JVM_REQUIRED_ARGS} ${JVM_LIBRARY_PATH_MINUSD}"
+fi
+
 JAVA_OPTS="-Xms${JVM_MINIMUM_MEMORY} -Xmx${JVM_MAXIMUM_MEMORY} ${JAVA_OPTS} ${JVM_REQUIRED_ARGS} ${JVM_SUPPORT_RECOMMENDED_ARGS} ${STASH_HOME_MINUSD}"
 
 # PermGen size needs to be increased if encountering OutOfMemoryError: PermGen problems. Specifying PermGen size is