Commit Graph

10 Commits

Author SHA1 Message Date
Phillip Webb
886b39293c Merge branch '1.5.x' 2018-01-30 12:51:45 -08:00
Phillip Webb
9b8cb9a463 Protect against symlink attacks
Update embedded launch script to no longer change ownership of files
or folders that already exist.

Fixes gh-11397
2018-01-30 12:42:31 -08:00
Phillip Webb
89b0ba2c14 Relocate test projects under spring-boot-tests
Move integration and deployment tests under a single `spring-boot-tests`
module.

See gh-9316
2017-10-04 16:34:38 -07:00
Ali Shahbour
56a5888008 Find .conf file next to symlink to jar that's using the launch script
See gh-8988
2017-09-26 13:12:40 +01:00
Brian Clozel
12d883f6b9 Introduce "server.servlet" configuration prefix
This commit refactors the `ServerProperties` property keys and
introduces a separate "server.servlet" namespace to isolate
servlet-specific properties from the rest.

Closes gh-8066
2017-02-07 16:48:22 +01:00
Gaurav Rawat
509be7474d Add force-stop support to launch script
Update the embedded launch script to support `force-stop`.

Closes gh-6223
2016-12-29 22:20:05 -08:00
Andy Wilkinson
24f8c737fb Make relative PID_FOLDER and LOG_FOLDER absolute using jar's directory
Closes gh-7092
Closes gh-7093
2016-10-14 09:19:11 +01:00
Andy Wilkinson
03deff9a1c Handle relative pid folder correctly in the launch script
Previously, a relative PID folder was not handled correctly when
running stop, status, or force_reload. This meant that a service
could be started when configured to use a relative pid file, but
then could not be stopped.

The PID folder should be treated as relative to the service's jar
file. This commit updates stop, status, and force_reload to push the
jar file's directory so that this is now the case for those three
commands.

Closes gh-7092
2016-10-13 16:51:54 +01:00
Andy Wilkinson
854cacdb4f Fix useStartStopDaemon in launch script and allow config via conf file
Commit 5a1ee6eb added support for disabling use of start-stop-daemon
via a placeholder in the default launch script. Unfortunately, that
placeholder was subsequently broken in 81a47639.

This commit reinstates the placeholder and adds tests to verify that all
of the placeholders in the launch script can be replaced and that they
have the required default values. Furthermore, it also allows the use of
start-stop-daemon to be configured via USE_START_STOP_DAEMON in an
app’s .conf file. This allows the configuration to be changed after the
app has been built.

Closes gh-4985
2016-01-21 14:58:51 +00:00
Andy Wilkinson
d1b47c8a8f Add integration tests for default launch script
This commit adds a suit of integration tests for the launch script. See
the accompanying README.adoc for further details.

Closes gh-4872
2016-01-13 13:28:14 +00:00