From 401f9dc0a009ee6d6b7eaf1ee399bee0c3e635b5 Mon Sep 17 00:00:00 2001
From: Benjamin Duffield <bduffield@palantir.com>
Date: Mon, 23 May 2016 22:27:06 +0200
Subject: [PATCH] var/tmp/files -> var/data/tmp

---
 .../groovy/com/palantir/gradle/javadist/DistTarTask.groovy  | 2 +-
 .../palantir/gradle/javadist/DistributionExtension.groovy   | 2 +-
 .../gradle/javadist/JavaDistributionPluginTests.groovy      | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/groovy/com/palantir/gradle/javadist/DistTarTask.groovy b/src/main/groovy/com/palantir/gradle/javadist/DistTarTask.groovy
index 8b83b2afd..fdf06a245 100644
--- a/src/main/groovy/com/palantir/gradle/javadist/DistTarTask.groovy
+++ b/src/main/groovy/com/palantir/gradle/javadist/DistTarTask.groovy
@@ -57,7 +57,7 @@ class DistTarTask extends Tar {
             }
         }
 
-        new File(project.projectDir, "var/tmp/files").mkdirs()
+        new File(project.projectDir, "var/data/tmp").mkdirs()
 
         from("${project.projectDir}/deployment") {
             into "${archiveRootDir}/deployment"
diff --git a/src/main/groovy/com/palantir/gradle/javadist/DistributionExtension.groovy b/src/main/groovy/com/palantir/gradle/javadist/DistributionExtension.groovy
index 4f2c6c6f9..cb0204b61 100644
--- a/src/main/groovy/com/palantir/gradle/javadist/DistributionExtension.groovy
+++ b/src/main/groovy/com/palantir/gradle/javadist/DistributionExtension.groovy
@@ -19,7 +19,7 @@ class DistributionExtension {
 
     private static final List<String> requiredJvmOpts = [
         '-Djava.security.egd=file:/dev/./urandom',
-        '-Djava.io.tmpdir=var/tmp/files'
+        '-Djava.io.tmpdir=var/data/tmp'
     ]
 
     private String serviceName
diff --git a/src/test/groovy/com/palantir/gradle/javadist/JavaDistributionPluginTests.groovy b/src/test/groovy/com/palantir/gradle/javadist/JavaDistributionPluginTests.groovy
index 9709699b1..65ae32c37 100644
--- a/src/test/groovy/com/palantir/gradle/javadist/JavaDistributionPluginTests.groovy
+++ b/src/test/groovy/com/palantir/gradle/javadist/JavaDistributionPluginTests.groovy
@@ -101,7 +101,7 @@ class JavaDistributionPluginTests extends Specification {
         new File(projectDir, 'dist/service-name-0.1/var/conf/service-name.yml').exists()
     }
     
-    def 'produce distribution bundle and check var/tmp/files is created' () {
+    def 'produce distribution bundle and check var/data/tmp is created' () {
         given:
         createUntarBuildFile(buildFile)
 
@@ -114,7 +114,7 @@ class JavaDistributionPluginTests extends Specification {
         buildResult.task(':untar').outcome == TaskOutcome.SUCCESS
 
         // check content was extracted
-        new File(projectDir, 'dist/service-name-0.1/var/tmp/files').exists()
+        new File(projectDir, 'dist/service-name-0.1/var/data/tmp').exists()
     }
 
     def 'produce distribution bundle with custom exclude set' () {
@@ -268,7 +268,7 @@ class JavaDistributionPluginTests extends Specification {
         // check start script uses default JVM options
         new File(projectDir, 'dist/service-name-0.1/service/bin/service-name').exists()
         String startScript = readFully('dist/service-name-0.1/service/bin/service-name')
-        startScript.contains('DEFAULT_JVM_OPTS=\'"-Djava.security.egd=file:/dev/./urandom" "-Djava.io.tmpdir=var/tmp/files" "-Xmx4M" "-Djavax.net.ssl.trustStore=truststore.jks"\'')
+        startScript.contains('DEFAULT_JVM_OPTS=\'"-Djava.security.egd=file:/dev/./urandom" "-Djava.io.tmpdir=var/data/tmp" "-Xmx4M" "-Djavax.net.ssl.trustStore=truststore.jks"\'')
     }
 
     def 'produce distribution bundle that populates config.sh' () {