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

Enable environment export for upstart loader #1080

Merged
merged 3 commits into from
Dec 30, 2017
Merged

Enable environment export for upstart loader #1080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ec79d7
Load variables in /etc/default/{{env_file}}; pass on to process
timcharper Aug 28, 2017
078c260
Merge branch 'master' into fix-upstart
muuki88 Dec 25, 2017
562cdfb
enable env export for upstart loader
kardapoltsev Dec 30, 2017
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
5 changes: 4 additions & 1 deletion src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/upstart/start-template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@ chdir ${{chdir}}

# Start the process
script
exec sudo -u ${{daemon_user}} bin/${{exec}}
# Mark variables which are modified or created for export
set -a
[ -f ${{env_config}} ] && . ${{env_config}}
exec sudo -E -u ${{daemon_user}} bin/${{exec}}
end script
2 changes: 1 addition & 1 deletion src/sbt-test/debian/test-executableScriptName/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ debianPackageRecommends in Debian += "git"

TaskKey[Unit]("checkUpstartScript") := {
val script = IO.read(target.value / "debian-test-0.1.0" / "etc" / "init" / "debian-test.conf")
assert(script.contains("exec sudo -u debian-test bin/debian-exec"), "wrong exec call\n" + script)
assert(script.contains("exec sudo -E -u debian-test bin/debian-exec"), "wrong exec call\n" + script)
streams.value.log.success("Successfully tested control script")
()
}