Merge pull request #31 from cagiti/updated-tmp-dir

Updated how the tmp directory is configured

jobs/jenkins-master/templates/bin/pre-start.erb

@@ -3,10 +3,6 @@
 set -e # exit immediately if a simple command exits with a non-zero status
 set -u # report the usage of uninitialized variables
 
-mkdir -p /var/vcap/tmp
-chgrp vcap /var/vcap/tmp
-chmod g+w /var/vcap/tmp
-
 mkdir -p /var/vcap/store/jenkins-master
 mkdir -p /var/vcap/store/jenkins-master/init.groovy.d
 mkdir -p /var/vcap/store/jenkins-master/plugins

jobs/jenkins-master/templates/data/properties.sh.erb

@@ -21,4 +21,4 @@ export JENKINS=/var/vcap/packages/jenkins/jenkins/jenkins_${JENKINS_VERSION}.war
 export MEMORY_SETTINGS=""
 
 export JENKINS_HOME=/var/vcap/store/jenkins-master
-export JENKINS_ARGS="--sessionTimeout=1440 -Djava.io.tmpdir=$JENKINS_HOME/tmp"
+export JENKINS_ARGS="--sessionTimeout=1440"

jobs/jenkins-master/templates/helpers/ctl_setup.sh

@@ -80,8 +80,8 @@ then
   export JAVA_HOME="/var/vcap/packages/java7"
 fi
 
-export JENKINS_TMP_PATH="/var/vcap/tmp"
-export JAVA_OPTS="-Djava.io.tmpdir=$JENKINS_TMP_PATH"
+export JENKINS_TMP_PATH="${TMP_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Djava.io.tmpdir=${JENKINS_TMP_PATH}"
 
 # setup CLASSPATH for all jars/ folders within packages
 export CLASSPATH=${CLASSPATH:-''} # default to empty

jobs/jenkins-slave/templates/helpers/ctl_setup.sh

@@ -80,8 +80,8 @@ then
   export JAVA_HOME="/var/vcap/packages/java7"
 fi
 
-export JENKINS_TMP_PATH="$HOME/tmp"
-export JAVA_OPTS="-Djava.io.tmpdir=$JENKINS_TMP_PATH"
+export JENKINS_TMP_PATH="${TMP_DIR}"
+export JAVA_OPTS="${JAVA_OPTS} -Djava.io.tmpdir=$JENKINS_TMP_PATH"
 
 # setup CLASSPATH for all jars/ folders within packages
 export CLASSPATH=${CLASSPATH:-''} # default to empty