Merge pull request #434 from sbt/fix/upstart-template

FIX install command in upstart to use daemon_group
sbt · Dec 13, 2014 · 9660112 · 9660112
2 parents 5b9c385 + 5fbe5bf
commit 9660112
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/...rces/com/typesafe/sbt/packager/archetypes/java_server/systemloader/upstart/start-template b/...rces/com/typesafe/sbt/packager/archetypes/java_server/systemloader/upstart/start-template
@@ -21,7 +21,7 @@ respawn
 respawn limit ${{retries}} ${{retryTimeout}}
 
 pre-start script
-	[ -d /var/run/${{app_name}} ] || install -m 755 -o ${{daemon_user}} -g ${{daemon_user}} -d /var/run/${{app_name}}
+	[ -d /var/run/${{app_name}} ] || install -m 755 -o ${{daemon_user}} -g ${{daemon_group}} -d /var/run/${{app_name}}
 end script
 
 # set the working directory of the job processes

diff --git a/src/sbt-test/debian/upstart-deb/build.sbt b/src/sbt-test/debian/upstart-deb/build.sbt
@@ -4,7 +4,10 @@ enablePlugins(JavaServerAppPackaging)
 
 serverLoading in Debian := ServerLoader.Upstart
 
-daemonUser in Debian := "root"
+// TODO change this after #437 is fixed
+daemonUser in Linux := "root"
+
+daemonGroup in Linux := "app-group"
 
 mainClass in Compile := Some("empty")
 
@@ -49,5 +52,7 @@ TaskKey[Unit]("check-startup-script") <<= (target, streams) map { (target, out)
   assert(script.contains("stop on runlevel [016]"), "script doesn't contain stop on runlevel header\n" + script)
   assert(!script.contains("start on started"), "script contains start on started header\n" + script)
   assert(!script.contains("stop on stopping"), "script contains stop on stopping header\n" + script)
+  // should contain
+  assert(script contains "[ -d /var/run/debian-test ] || install -m 755 -o root -g app-group -d /var/run/debian-test", "Script is missing /var/run dir install\n" + script)
   ()
 }