Merge pull request #893 from mitch-seymour/patch-3

Fixed SystemVPlugin override start script behavior for debian
sbt · Oct 11, 2016 · bbeead2 · bbeead2
2 parents 7f7b8c0 + 8331ba5
commit bbeead2
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 2 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemVPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemVPlugin.scala
@@ -53,7 +53,7 @@ object SystemVPlugin extends AutoPlugin {
       Seq(
         // set the template
         linuxStartScriptTemplate := linuxStartScriptUrl(
-          (sourceDirectory in Compile).value,
+          sourceDirectory.value,
           serverLoading.value,
           "start-debian-template"
         )

diff --git a/src/sbt-test/debian/override-start-script-systemd/build.sbt b/src/sbt-test/debian/override-start-script-systemd/build.sbt
@@ -0,0 +1,25 @@
+enablePlugins(JavaServerAppPackaging, JDebPackaging, SystemdPlugin)
+
+// TODO change this after #437 is fixed
+daemonUser in Linux := "root"
+daemonGroup in Linux := "app-group"
+
+mainClass in Compile := Some("empty")
+
+name := "debian-test"
+version := "0.1.0"
+maintainer := "Mitch Seymour <[email protected]>"
+
+packageSummary := "Test debian package"
+packageDescription := """A fun package description of our software,
+  with multiple lines."""
+
+TaskKey[Unit]("check-startup-script") <<= (target, streams) map { (target, out) =>
+  val extracted = target / "tmp" / "extracted-package"
+  extracted.mkdirs()
+  Seq("dpkg-deb", "-R", (target / "debian-test_0.1.0_all.deb").absolutePath, extracted.absolutePath).!
+
+  val script = IO.read(extracted / "lib" / "systemd" / "system" / "debian-test.service")
+  assert(script.startsWith("# right systemd template"), s"override script wasn't picked, script is\n$script")
+  ()
+}
diff --git a/...override-start-script/project/plugins.sbt → ...-start-script-systemd/project/plugins.sbt b/...override-start-script/project/plugins.sbt → ...-start-script-systemd/project/plugins.sbt
diff --git a/src/sbt-test/debian/override-start-script-systemd/src/templates/start b/src/sbt-test/debian/override-start-script-systemd/src/templates/start
@@ -0,0 +1,2 @@
+# check that old start template isn't picked
+# wrong systemd start template
diff --git a/src/sbt-test/debian/override-start-script-systemd/src/templates/systemloader/systemd b/src/sbt-test/debian/override-start-script-systemd/src/templates/systemloader/systemd
@@ -0,0 +1 @@
+# right systemd template
diff --git a/...bt-test/debian/override-start-script/test → ...debian/override-start-script-systemd/test b/...bt-test/debian/override-start-script/test → ...debian/override-start-script-systemd/test
diff --git a/src/sbt-test/debian/override-start-script-systemv/build.sbt b/src/sbt-test/debian/override-start-script-systemv/build.sbt
@@ -0,0 +1,25 @@
+enablePlugins(JavaServerAppPackaging, JDebPackaging, SystemVPlugin)
+
+// TODO change this after #437 is fixed
+daemonUser in Linux := "root"
+daemonGroup in Linux := "app-group"
+
+mainClass in Compile := Some("empty")
+
+name := "debian-test"
+version := "0.1.0"
+maintainer := "Mitch Seymour <[email protected]>"
+
+packageSummary := "Test debian package"
+packageDescription := """A fun package description of our software,
+  with multiple lines."""
+
+TaskKey[Unit]("check-startup-script") <<= (target, streams) map { (target, out) =>
+  val extracted = target / "tmp" / "extracted-package"
+  extracted.mkdirs()
+  Seq("dpkg-deb", "-R", (target / "debian-test_0.1.0_all.deb").absolutePath, extracted.absolutePath).!
+
+  val script = IO.read(extracted / "etc" / "init.d" / "debian-test")
+  assert(script.startsWith("# right systemv template"), s"override script wasn't picked, script is\n$script")
+  ()
+}
diff --git a/src/sbt-test/debian/override-start-script-systemv/project/plugins.sbt b/src/sbt-test/debian/override-start-script-systemv/project/plugins.sbt
@@ -0,0 +1,3 @@
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))
+
+libraryDependencies += "org.vafer" % "jdeb" % "1.3" artifacts (Artifact("jdeb", "jar", "jar"))
diff --git a/src/sbt-test/debian/override-start-script-systemv/src/templates/start b/src/sbt-test/debian/override-start-script-systemv/src/templates/start
@@ -0,0 +1,2 @@
+# check that old start template isn't picked
+# wrong systemv start template
diff --git a/src/sbt-test/debian/override-start-script-systemv/src/templates/systemloader/systemv b/src/sbt-test/debian/override-start-script-systemv/src/templates/systemloader/systemv
@@ -0,0 +1 @@
+# right systemv template
diff --git a/src/sbt-test/debian/override-start-script-systemv/test b/src/sbt-test/debian/override-start-script-systemv/test
@@ -0,0 +1,6 @@
+# Run the debian packaging.
+> debian:packageBin
+$ exists target/debian-test_0.1.0_all.deb
+
+# Check files for defaults
+> check-startup-script
diff --git a/...st/debian/override-start-script/build.sbt → ...n/override-start-script-upstart/build.sbt b/...st/debian/override-start-script/build.sbt → ...n/override-start-script-upstart/build.sbt
diff --git a/src/sbt-test/debian/override-start-script-upstart/project/plugins.sbt b/src/sbt-test/debian/override-start-script-upstart/project/plugins.sbt
@@ -0,0 +1,3 @@
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))
+
+libraryDependencies += "org.vafer" % "jdeb" % "1.3" artifacts (Artifact("jdeb", "jar", "jar"))
diff --git a/...override-start-script/src/templates/start → ...-start-script-upstart/src/templates/start b/...override-start-script/src/templates/start → ...-start-script-upstart/src/templates/start
diff --git a/...script/src/templates/systemloader/upstart → ...pstart/src/templates/systemloader/upstart b/...script/src/templates/systemloader/upstart → ...pstart/src/templates/systemloader/upstart
diff --git a/src/sbt-test/debian/override-start-script-upstart/test b/src/sbt-test/debian/override-start-script-upstart/test
@@ -0,0 +1,6 @@
+# Run the debian packaging.
+> debian:packageBin
+$ exists target/debian-test_0.1.0_all.deb
+
+# Check files for defaults
+> check-startup-script
diff --git a/src/sbt-test/debian/override-start-script/src/templates/systemloader/systemv b/src/sbt-test/debian/override-start-script/src/templates/systemloader/systemv
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# check that old start template isn't picked
		# wrong systemd start template
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("project.version"))

		libraryDependencies += "org.vafer" % "jdeb" % "1.3" artifacts (Artifact("jdeb", "jar", "jar"))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# check that old start template isn't picked
		# wrong systemv start template