Commit 2177ce4 2 people authored and committed
1 parent 23583eb commit 2177ce4 Copy full SHA for 2177ce4
File tree 2 files changed +4
-1
lines changed
resources/com/typesafe/sbt/packager/archetypes/systemloader/systemd
scala/com/typesafe/sbt/packager/archetypes/systemloader
2 files changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,7 @@ ExecReload=/bin/kill -HUP $MAINPID
11
11
Restart=always
12
12
RestartSec=${{retryTimeout}}
13
13
SuccessExitStatus=${{SuccessExitStatus}}
14
+ TimeoutStopSec=${{TimeoutStopSec}}
14
15
User=${{daemon_user}}
15
16
ExecStartPre=/bin/mkdir -p /run/${{app_name}}
16
17
ExecStartPre=/bin/chown ${{daemon_user}}:${{daemon_group}} /run/${{app_name}}
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import sbt._
4
4
import sbt .Keys .{sourceDirectory , target }
5
5
import com .typesafe .sbt .packager .Keys .{
6
6
defaultLinuxStartScriptLocation ,
7
+ killTimeout ,
7
8
linuxMakeStartScript ,
8
9
linuxPackageMappings ,
9
10
linuxScriptReplacements ,
@@ -58,7 +59,8 @@ object SystemdPlugin extends AutoPlugin {
58
59
isConf = true
59
60
),
60
61
// add additional system configurations to script replacements
61
- linuxScriptReplacements += (" SuccessExitStatus" -> systemdSuccessExitStatus.value.mkString(" " ))
62
+ linuxScriptReplacements += (" SuccessExitStatus" -> systemdSuccessExitStatus.value.mkString(" " )),
63
+ linuxScriptReplacements += (" TimeoutStopSec" -> killTimeout.value.toString)
62
64
)
63
65
64
66
def debianSettings : Seq [Setting [_]] = inConfig(Debian )(defaultLinuxStartScriptLocation := " /lib/systemd/system" )
You can’t perform that action at this time.
0 commit comments