Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX install command in upstart to use daemon_group #434

Merged
merged 2 commits into from
Dec 13, 2014
Merged

FIX install command in upstart to use daemon_group #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9283051
FIX install command in upstart to use daemon_group
muuki88 Dec 12, 2014
5fbe5bf
Adding regression test
muuki88 Dec 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...rces/com/typesafe/sbt/packager/archetypes/java_server/systemloader/upstart/start-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 6 additions & 1 deletion src/sbt-test/debian/upstart-deb/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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)
()
}