From be75b7f44c8e0aba5dd272250c5fc41f7837b50a Mon Sep 17 00:00:00 2001
From: David Amorim Faria <d.amorim-faria@tech.leaseweb.com>
Date: Thu, 29 Oct 2015 16:24:06 +0100
Subject: [PATCH] CLOUDSTACK-9010: adjust packaging for centos7

 * 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.
---
 packaging/centos7/cloud-management.service   | 10 ++++++----
 packaging/centos7/cloud-management.sysconfig |  5 +++--
 packaging/centos7/cloud.spec                 |  1 +
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packaging/centos7/cloud-management.service b/packaging/centos7/cloud-management.service
index 697ad119d93..19989ece180 100644
--- a/packaging/centos7/cloud-management.service
+++ b/packaging/centos7/cloud-management.service
@@ -24,13 +24,15 @@ Description=CloudStack Management Server
 After=syslog.target network.target
 
 [Service]
-Type=forking
-ExecStart=/usr/sbin/tomcat-sysd start
-ExecStop=/usr/sbin/tomcat-sysd stop
+Type=simple
+EnvironmentFile=/etc/tomcat/tomcat.conf
+Environment="NAME=cloudstack-management"
+EnvironmentFile=-/etc/sysconfig/cloudstack-management
+ExecStart=/usr/libexec/tomcat/server start
+ExecStop=/usr/libexec/tomcat/server stop
 SuccessExitStatus=143
 User=cloud
 Group=cloud
-EnvironmentFile=/etc/sysconfig/cloudstack-management
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packaging/centos7/cloud-management.sysconfig b/packaging/centos7/cloud-management.sysconfig
index 961072abcce..c262b115181 100644
--- a/packaging/centos7/cloud-management.sysconfig
+++ b/packaging/centos7/cloud-management.sysconfig
@@ -27,10 +27,11 @@ CATALINA_HOME="/usr/share/cloudstack-management"
 JASPER_HOME="/usr/share/cloudstack-management"
 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
-  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
 
 TOMCAT_USER="cloud"
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 5a73576b4ee..327af860a98 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -254,6 +254,7 @@ for name in catalina.properties db.properties log4j-cloud.xml web.xml \
 do
   cp packaging/centos7/tomcat7/$name \
     ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
+  rm -f ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name
 done
 
 #ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \