apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9010: adjust packaging for centos7

Browse Source 
* Adjust systemd service to match tomcat7 startup,
   and change service type to simple.

 * Adjust sysconfig to only have one JAVA_OPTS
   due to behaviour change in tomcat7.

 * Adjust spec to remove some config files
   from WEB-INF since they are placed in /etc.
   This is a similar behaviour to the centos6 spec.
This commit is contained in:
David Amorim Faria 2015-10-29 16:24:06 +01:00 committed by David Amorim Faria
parent c03956ebec
commit be75b7f44c
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packaging/centos7/cloud-management.service
View File

@ -24,13 +24,15 @@ Description=CloudStack Management Server
After=syslog.target network.target After=syslog.target network.target
[Service] [Service]
Type=forking Type=simple
ExecStart=/usr/sbin/tomcat-sysd start EnvironmentFile=/etc/tomcat/tomcat.conf
ExecStop=/usr/sbin/tomcat-sysd stop Environment="NAME=cloudstack-management"
EnvironmentFile=-/etc/sysconfig/cloudstack-management
ExecStart=/usr/libexec/tomcat/server start
ExecStop=/usr/libexec/tomcat/server stop
SuccessExitStatus=143 SuccessExitStatus=143
User=cloud User=cloud
Group=cloud Group=cloud
EnvironmentFile=/etc/sysconfig/cloudstack-management
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

5
packaging/centos7/cloud-management.sysconfig
View File

@ -27,10 +27,11 @@ CATALINA_HOME="/usr/share/cloudstack-management"
JASPER_HOME="/usr/share/cloudstack-management" JASPER_HOME="/usr/share/cloudstack-management"
CATALINA_TMPDIR="/usr/share/cloudstack-management/temp" CATALINA_TMPDIR="/usr/share/cloudstack-management/temp"
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"
if [ -r "/etc/cloudstack/management/cloudmanagementserver.keystore" ] ; then if [ -r "/etc/cloudstack/management/cloudmanagementserver.keystore" ] ; then
JAVA_OPTS="$JAVA_OPTS -Djavax.net.ssl.trustStore=/etc/cloudstack/management/cloudmanagementserver.keystore -Djavax.net.ssl.trustStorePassword=vmops.com " 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/cloudmanagementserver.keystore -Djavax.net.ssl.trustStorePassword=vmops.com "
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"
fi fi
TOMCAT_USER="cloud" TOMCAT_USER="cloud"

1
packaging/centos7/cloud.spec
View File

@ -254,6 +254,7 @@ for name in catalina.properties db.properties log4j-cloud.xml web.xml \
do do
cp packaging/centos7/tomcat7/$name \ cp packaging/centos7/tomcat7/$name \
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
done done
#ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \ #ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \