Foward merge #3139 from 4.11 to master (4.12)

This commit is contained in:
GabrielBrascher 2019-02-04 19:05:11 -02:00
commit ff07c17a26
2 changed files with 17 additions and 21 deletions

View File

@ -18,11 +18,7 @@
# Where your java installation lives
#JAVA_HOME="/usr/lib/jvm/java"
if [ -r "/etc/cloudstack/management/cloud.jks" ] ; then
JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M -XX:MaxPermSize=800m -Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloud.jks -Djavax.net.ssl.trustStorePassword=vmops.com -Djava.security.properties=/etc/cloudstack/management/java.security.ciphers "
else
JAVA_OPTS="-Djava.awt.headless=true -Dcom.sun.management.jmxremote=false -Xmx2g -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/cloudstack/management/ -XX:PermSize=512M -XX:MaxPermSize=800m -Djava.security.properties=/etc/cloudstack/management/java.security.ciphers "
fi
CLOUDSTACK_USER="cloud"