Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
9c300307
Commit
9c300307
authored
Feb 23, 2016
by
Uwe Schaefer
Committed by
Stephane Nicoll
Feb 29, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add CONF_FOLDER property
Closes gh-5203
parent
0232bef8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
deployment.adoc
spring-boot-docs/src/main/asciidoc/deployment.adoc
+3
-0
launch.script
...urces/org/springframework/boot/loader/tools/launch.script
+5
-1
No files found.
spring-boot-docs/src/main/asciidoc/deployment.adoc
View file @
9c300307
...
...
@@ -571,6 +571,9 @@ the default behavior in a script or on the command line:
|`LOG_FOLDER`
|The name of the folder to put log files in (`/var/log` by default).
|`CONF_FOLDER`
|The name of the folder to read .conf files from (same folder as jar-file by default).
|`LOG_FILENAME`
|The name of the log file in the `LOG_FOLDER` (`<appname>.log` by default).
...
...
spring-boot-tools/spring-boot-loader-tools/src/main/resources/org/springframework/boot/loader/tools/launch.script
View file @
9c300307
...
...
@@ -42,8 +42,12 @@ cd "$WORKING_DIR" || exit 1
# Source any config file
configfile
=
"
$(
basename
"
${
jarfile
%.*
}
.conf"
)
"
# Initialize CONF_FOLDER location defaulting to jarfolder
[[
-z
"
$CONF_FOLDER
"
]]
&&
CONF_FOLDER
=
"
${
jarfolder
}
"
# shellcheck source=/dev/null
[[
-r
"
${
jarfolder
}
/
${
configfile
}
"
]]
&&
source
"
${
jarfolder
}
/
${
configfile
}
"
[[
-r
"
${
CONF_FOLDER
}
/
${
configfile
}
"
]]
&&
source
"
${
CONF_FOLDER
}
/
${
configfile
}
"
# Initialize PID/LOG locations if they weren't provided by the config file
[[
-z
"
$PID_FOLDER
"
]]
&&
PID_FOLDER
=
"{{pidFolder:/var/run}}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment