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

Jump to bottom

Allow setting java_opts only #343

Merged
merged 11 commits into from
Oct 29, 2024
Merged

Allow setting java_opts only #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
c2c303d
Allow setting java_opts only
tuxmea Oct 28, 2024
09c93d3
Fix closing quotes
tuxmea Oct 28, 2024
ffe8c24
Use individual or generic java opts in domain conf
tuxmea Oct 28, 2024
10a5206
Fix variable name
tuxmea Oct 28, 2024
6e47935
Update REFERENCE.md
tuxmea Oct 28, 2024
923c83e
Update README regarding parameter change
tuxmea Oct 28, 2024
4bfabf6
Typo in README
tuxmea Oct 28, 2024
bd84802
Merge branch 'master' into java_opts
tuxmea Oct 28, 2024
783ba23
Merge remote-tracking branch 'origin/master' into java_opts
tuxmea Oct 28, 2024
40ae8e7
Switch behavior
tuxmea Oct 28, 2024
03fa7e7
Remove unneeded toc line
tuxmea Oct 28, 2024
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
11 changes: 10 additions & 1 deletion templates/domain.conf.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,16 @@ fi
# Specify options to pass to the Java VM.
#
if [ "x$JAVA_OPTS" = "x" ]; then
JAVA_OPTS="-Xms<%= $wildfly::java_xms %> -Xmx<%= $wildfly::java_xmx %> -XX:MaxMetaspaceSize=<%= $wildfly::java_maxmetaspace_size %>"
JAVA_OPTS=$JAVA_OPTS"
<%- unless $wildfly::java_xms == '' { -%>
JAVA_OPTS="$JAVA_OPTS -Xms <%= $wildfly::java_xms %>"
<%- } -%>
<%- unless $wildfly::java_xmx == '' { -%>
JAVA_OPTS="$JAVA_OPTS -Xmx <%= $wildfly::java_xmx %>"
<%- } -%>
<%- unless $wildfly::java_maxmetaspace_size == '' { -%>
JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=<%= $wildfly::java_maxmetaspace_size %>"
<%- } -%>
JAVA_OPTS="$JAVA_OPTS <% if $wildfly::java_opts =~ Array { -%>
<%= $wildfly::java_opts.join(" ") -%>
<% } elsif $wildfly::java_opts =~ String { -%>
Expand Down
17 changes: 15 additions & 2 deletions templates/standalone.conf.epp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,21 @@ fi
# Specify options to pass to the Java VM.
#
if [ "x$JAVA_OPTS" = "x" ]; then
JAVA_OPTS="-Xms<%= $wildfly::java_xms %> -Xmx<%= $wildfly::java_xmx %> -XX:MaxMetaspaceSize=<%= $wildfly::java_maxmetaspace_size %>"
JAVA_OPTS="$JAVA_OPTS <%= $wildfly::java_opts %>"
JAVA_OPTS="$JAVA_OPTS"
<%- unless $wildfly::java_xms == '' { -%>
JAVA_OPTS="$JAVA_OPTS -Xms<%= $wildfly::java_xms %>"
<%- } -%>
<%- unless $wildfly::java_xmx == '' { -%>
JAVA_OPTS="$JAVA_OPTS -Xmx<%= $wildfly::java_xmx %>"
<%- } -%>
<%- unless $wildfly::java_maxmetaspace_size == '' { -%>
JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=<%= $wildfly::java_maxmetaspace_size %>"
<%- } -%>
JAVA_OPTS="$JAVA_OPTS <% if $wildfly::java_opts =~ Array { -%>
<%= $wildfly::java_opts.join(" ") -%>
<% } elsif $wildfly::java_opts =~ String { -%>
<%= $wildfly::java_opts -%>
<% } -%>"
else
echo "JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS"
fi
Expand Down