Use recommended path for systemd scripts (#795)

* Use recommended path for systemd scripts * Fix tests
sbt · Jun 9, 2016 · 1f67bcb · 1f67bcb
1 parent 5d11521
commit 1f67bcb
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemdPlugin.scala b/src/main/scala/com/typesafe/sbt/packager/archetypes/systemloader/SystemdPlugin.scala
@@ -31,7 +31,7 @@ object SystemdPlugin extends AutoPlugin {
   override def requires = SystemloaderPlugin
 
   override def projectSettings: Seq[Setting[_]] =
-    inConfig(Debian)(systemdSettings) ++ inConfig(Rpm)(systemdSettings)
+    debianSettings ++ inConfig(Debian)(systemdSettings) ++ rpmSettings ++ inConfig(Rpm)(systemdSettings)
 
   def systemdSettings: Seq[Setting[_]] = Seq(
     // used by other archetypes to define systemloader dependent behaviour
@@ -41,7 +41,6 @@ object SystemdPlugin extends AutoPlugin {
     stopRunlevels := None,
     requiredStartFacilities := Some("network.target"),
     requiredStopFacilities := Some("network.target"),
-    defaultLinuxStartScriptLocation := "/usr/lib/systemd/system",
     linuxStartScriptName := Some(packageName.value + ".service"),
     // add systemloader to mappings
     linuxPackageMappings ++= startScriptMapping(
@@ -52,4 +51,12 @@ object SystemdPlugin extends AutoPlugin {
     )
   )
 
+  def debianSettings: Seq[Setting[_]] = inConfig(Debian)(
+    defaultLinuxStartScriptLocation := "/lib/systemd/system"
+  )
+
+  def rpmSettings: Seq[Setting[_]] = inConfig(Rpm)(
+    defaultLinuxStartScriptLocation := "/usr/lib/systemd/system"
+  )
+
 }
diff --git a/src/sbt-test/debian/systemd-deb/build.sbt b/src/sbt-test/debian/systemd-deb/build.sbt
@@ -13,7 +13,7 @@ requiredStartFacilities in Debian := Some("network.target")
 daemonUser in Linux := "testuser"
 
 TaskKey[Unit]("check-startup-script") <<= (target, streams) map { (target, out) =>
-  val script = IO.read(target / "debian-test-0.1.0" / "usr" / "lib" / "systemd" / "system" / "debian-test.service")
+  val script = IO.read(target / "debian-test-0.1.0" / "lib" / "systemd" / "system" / "debian-test.service")
   assert(script.contains("Requires=network.target"), "script doesn't contain Default-Start header\n" + script)
   assert(script.contains("User=testuser"), "script doesn't contain `User` header\n" + script)
   assert(script.contains("EnvironmentFile=/etc/default/debian-test"), "script doesn't contain EnvironmentFile header\n" + script)

diff --git a/src/sbt-test/debian/systemd-deb/test b/src/sbt-test/debian/systemd-deb/test
@@ -2,7 +2,7 @@
 > debian:package-bin
 $ exists target/debian-test_0.1.0_all.deb
 
-$ exists target/debian-test-0.1.0/usr/lib/systemd/system/debian-test.service
+$ exists target/debian-test-0.1.0/lib/systemd/system/debian-test.service
 > show debian:serverLoader
 > show debian:linuxStartScriptTemplate
 > plugins

diff --git a/src/sphinx/archetypes/systemloaders.rst b/src/sphinx/archetypes/systemloaders.rst
@@ -86,6 +86,25 @@ as the* ``daemonUser`` *. Simply disable requiretty to use Upstart or modify the
 Customization
 -------------
 
+Native packager provides general settings to customize the created systemloader scripts.
+
+Start Script Location
+~~~~~~~~~~~~~~~~~~~~~
+
+In order to change the location of the systemloader script/config file you need to adjust the
+``defaultLinuxStartScriptLocation`` like this:
+
+.. code-block:: scala
+
+  defaultLinuxStartScriptLocation in Debian := "/lib/systemd/system"
+
+
+You may need to change these paths according to your distribution. References are
+
+- `Ubuntu systemd documentation <https://wiki.ubuntu.com/systemd>`_
+- `Debian systemd documentation <https://wiki.debian.org/Teams/pkg-systemd/Packaging>`_
+- `RHEL systemd documentation <https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/System_Administrators_Guide/chap-Managing_Services_with_systemd.html>`_
+
 Customize Start Script
 ~~~~~~~~~~~~~~~~~~~~~~