Merge pull request #150 from hfs/wip/log-directory

Use defaultLinuxLogsLocation for /var/log
sbt · Feb 3, 2014 · 6d95423 · 6d95423
2 parents 484b9b0 + 6628136
commit 6d95423
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 2 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/JavaServerApplication.scala
@@ -88,8 +88,8 @@ object JavaServerAppPackaging {
           d.mkdirs()
           LinuxPackageMapping(Seq(d -> (logsDir + "/" + name)), LinuxFileMetaData(user, group))
       },
-      linuxPackageSymlinks in Debian <+= (normalizedName, defaultLinuxInstallLocation) map {
-        (name, install) => LinuxSymlink(install + "/" + name + "/logs", "/var/log/" + name)
+      linuxPackageSymlinks in Debian <+= (normalizedName, defaultLinuxInstallLocation, defaultLinuxLogsLocation) map {
+        (name, install, logsDir) => LinuxSymlink(install + "/" + name + "/logs", logsDir + "/" + name)
       },
 
       // === Maintainer scripts === 

diff --git a/src/sbt-test/debian/log-directory/build.sbt b/src/sbt-test/debian/log-directory/build.sbt
@@ -0,0 +1,37 @@
+import NativePackagerKeys._
+import com.typesafe.sbt.packager.archetypes.ServerLoader
+
+packageArchetype.java_server
+
+serverLoading in Debian := ServerLoader.Upstart
+
+daemonUser in Debian := "root"
+
+mainClass in Compile := Some("empty")
+
+name := "debian-test"
+
+version := "0.1.0"
+
+maintainer := "Josh Suereth <[email protected]>"
+
+packageSummary := "Test debian package"
+
+packageDescription := """A fun package description of our software,
+  with multiple lines."""
+
+defaultLinuxLogsLocation := "/non-standard/log"
+
+InputKey[Unit]("check-softlink") <<= inputTask { (argTask: TaskKey[Seq[String]]) =>
+  (argTask) map { (args: Seq[String]) =>
+    assert(args.size >= 2, "Usage: check-softlink link to target")
+    val link = args(0)
+    val target = args(args.size - 1)
+    val absolutePath = ("readlink -m " + link).!!.trim
+    assert(link != absolutePath,
+        "Expected symbolic link '" + link + "' does not exist")
+    assert(target == absolutePath,
+        "Expected symbolic link '" + link + "' to point to '" +
+        target + "', but instead it's '" + absolutePath + "'")
+  }
+}
diff --git a/src/sbt-test/debian/log-directory/project/plugins.sbt b/src/sbt-test/debian/log-directory/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))
diff --git a/src/sbt-test/debian/log-directory/test b/src/sbt-test/debian/log-directory/test
@@ -0,0 +1,15 @@
+# Run the debian packaging.
+> debian:package-bin
+$ exists target/debian-test-0.1.0.deb
+
+$ exists target/debian-test-0.1.0/etc
+$ exists target/debian-test-0.1.0/etc/default/debian-test
+$ exists target/debian-test-0.1.0/etc/init/debian-test.conf
+
+# Check defaults
+$ exists target/debian-test-0.1.0/DEBIAN/prerm
+$ exists target/debian-test-0.1.0/DEBIAN/postinst
+
+# Check that the non-standard log directory was used
+$ exists target/debian-test-0.1.0/non-standard/log/debian-test
+> check-softlink target/debian-test-0.1.0/usr/share/debian-test/logs points to /non-standard/log/debian-test
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))