This is an automated email from the ASF dual-hosted git repository. bhaisaab pushed a commit to branch CLOUDSTACK-10012 in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f0c0d5ca9bee794f9731eb08fbe2c3d293a8a1d5 Author: Rohit Yadav <[email protected]> AuthorDate: Mon Aug 7 19:28:20 2017 +0200 centos63: wip Signed-off-by: Rohit Yadav <[email protected]> --- packaging/centos63/cloud.spec | 93 ++++------------------------------ packaging/centos63/tomcat.sh | 18 ------- packaging/debian/init/cloud-management | 7 +-- 3 files changed, 12 insertions(+), 106 deletions(-) diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index abe50bc..1427733 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -44,7 +44,6 @@ Source0: %{name}-%{_maventag}.tgz BuildRoot: %{_tmppath}/%{name}-%{_maventag}-%{release}-build BuildRequires: java-1.8.0-openjdk-devel -BuildRequires: tomcat6 BuildRequires: ws-commons-util BuildRequires: jpackage-utils BuildRequires: gcc @@ -59,7 +58,6 @@ intelligent IaaS cloud implementation. %package management Summary: CloudStack management server UI -Requires: tomcat6 Requires: java-1.8.0-openjdk Requires: python Requires: bash @@ -193,7 +191,6 @@ Apache CloudStack Marvin integration tests %package mysql-ha Summary: Apache CloudStack Balancing Strategy for MySQL Requires: mysql-connector-java -Requires: tomcat6 Group: System Environmnet/Libraries %description mysql-ha Apache CloudStack Balancing Strategy for MySQL @@ -266,21 +263,12 @@ cp -r plugins/network-elements/cisco-vnmc/scripts/network/cisco/* ${RPM_BUILD_RO # Management mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/ -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management -# Specific for tomcat -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client -ln -sf /usr/share/tomcat6/bin ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/bin ln -sf /etc/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/conf -ln -sf /usr/share/tomcat6/lib ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib ln -sf /var/log/%{name}/management ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/logs -ln -sf /var/cache/%{name}/management/temp ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/temp -ln -sf /var/cache/%{name}/management/work ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/work - -/bin/touch ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management/catalina.out install -D client/target/utilities/bin/cloud-migrate-databases ${RPM_BUILD_ROOT}%{_bindir}/%{name}-migrate-databases install -D client/target/utilities/bin/cloud-set-guest-password ${RPM_BUILD_ROOT}%{_bindir}/%{name}-set-guest-password @@ -293,24 +281,20 @@ install -D client/target/utilities/bin/cloud-sysvmadm ${RPM_BUILD_ROOT}%{_bindir install -D client/target/utilities/bin/cloud-update-xenserver-licenses ${RPM_BUILD_ROOT}%{_bindir}/%{name}-update-xenserver-licenses cp -r client/target/utilities/scripts/db/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/setup -cp -r client/target/cloud-client-ui-%{_maventag}/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client +cp client/target/cloud-client-ui-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/cloud-management-server.jar + +mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib +cp client/target/bcprov-jdk15on-1.55.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/lib/ # Don't package the scripts in the management webapp rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/scripts rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms -for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml commons-logging.properties \ - catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties java.security.ciphers; do - mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name +for name in db.properties log4j-cloud.xml server-ssl.xml server-nonssl.xml commons-logging.properties \ + classpath.conf web.xml environment.properties java.security.ciphers; do + cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name done -ln -s %{_sysconfdir}/%{name}/management/log4j-cloud.xml \ - ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/log4j-cloud.xml - -mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/context.xml \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client - install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py install -D client/target/pythonlibs/jasypt-1.9.2.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.2.jar @@ -318,17 +302,11 @@ install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-management install -D packaging/centos63/cloud-management.sysconfig ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig/%{name}-management install -D server/target/conf/cloudstack-sudoers ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management -install -D packaging/centos63/tomcat.sh ${RPM_BUILD_ROOT}%{_initrddir}/tomcat.sh -install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina +#install -D server/target/conf/cloudstack-catalina.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name}-catalina chmod 440 ${RPM_BUILD_ROOT}%{_sysconfdir}/sudoers.d/%{name}-management -chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina -chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost -chmod 770 ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/mnt chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/%{name}/management -chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/work -chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/cache/%{name}/management/temp chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/management chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent @@ -464,41 +442,6 @@ if [ -f "%{_sysconfdir}/cloud.rpmsave/management/db.properties" ]; then mv %{_sysconfdir}/cloud.rpmsave/management/db.properties %{_sysconfdir}/cloud.rpmsave/management/db.properties.rpmsave fi -# Choose server.xml and tomcat.conf links based on old config, if exists -serverxml=%{_sysconfdir}/%{name}/management/server.xml -oldserverxml=%{_sysconfdir}/cloud.rpmsave/management/server.xml -if [ -f $oldserverxml ] || [ -L $oldserverxml ]; then - if stat -c %N $oldserverxml| grep -q server-ssl ; then - if [ -f $serverxml ] || [ -L $serverxml ]; then rm -f $serverxml; fi - ln -s %{_sysconfdir}/%{name}/management/server-ssl.xml $serverxml - echo Please verify the server.xml in saved folder, and make the required changes manually , saved folder available at $oldserverxml - else - if [ -f $serverxml ] || [ -L $serverxml ]; then rm -f $serverxml; fi - ln -s %{_sysconfdir}/%{name}/management/server-nonssl.xml $serverxml - echo Please verify the server.xml in saved folder, and make the required changes manually , saved folder available at $oldserverxml - - fi -else - echo "Unable to determine ssl settings for server.xml, please run cloudstack-setup-management manually" -fi - - -tomcatconf=%{_sysconfdir}/%{name}/management/tomcat6.conf -oldtomcatconf=%{_sysconfdir}/cloud.rpmsave/management/tomcat6.conf -if [ -f $oldtomcatconf ] || [ -L $oldtomcatconf ] ; then - if stat -c %N $oldtomcatconf| grep -q tomcat6-ssl ; then - if [ -f $tomcatconf ] || [ -L $tomcatconf ]; then rm -f $tomcatconf; fi - ln -s %{_sysconfdir}/%{name}/management/tomcat6-ssl.conf $tomcatconf - echo Please verify the tomcat6.conf in saved folder, and make the required changes manually , saved folder available at $oldtomcatconf - else - if [ -f $tomcatconf ] || [ -L $tomcatconf ]; then rm -f $tomcatconf; fi - ln -s %{_sysconfdir}/%{name}/management/tomcat6-nonssl.conf $tomcatconf - echo Please verify the tomcat6.conf in saved folder, and make the required changes manually , saved folder available at $oldtomcatconf - fi -else - echo "Unable to determine ssl settings for tomcat.conf, please run cloudstack-setup-management manually" -fi - if [ -f "%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore" ]; then cp -p %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore # make sure we only do this on the first install of this RPM, don't want to overwrite on a reinstall @@ -575,51 +518,36 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz #No default permission as the permission setup is complex %files management %defattr(-,root,root,-) -%dir %attr(0770,root,cloud) %{_sysconfdir}/%{name}/management/Catalina -%dir %attr(0770,root,cloud) %{_sysconfdir}/%{name}/management/Catalina/localhost -%dir %attr(0770,root,cloud) %{_sysconfdir}/%{name}/management/Catalina/localhost/client %dir %{_datadir}/%{name}-management %dir %attr(0770,root,cloud) %{_localstatedir}/%{name}/mnt %dir %attr(0770,cloud,cloud) %{_localstatedir}/%{name}/management %dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management -%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/work -%dir %attr(0770,root,cloud) %{_localstatedir}/cache/%{name}/management/temp %dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/management %config(noreplace) %{_sysconfdir}/sysconfig/%{name}-management %config(noreplace) %{_sysconfdir}/sudoers.d/%{name}-management %config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties %config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml -%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat6-nonssl.conf -%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat6-ssl.conf -%config(noreplace) %{_sysconfdir}/%{name}/management/Catalina/localhost/client/context.xml -%config(noreplace) %{_sysconfdir}/%{name}/management/catalina.policy -%config(noreplace) %{_sysconfdir}/%{name}/management/catalina.properties %config(noreplace) %{_sysconfdir}/%{name}/management/classpath.conf %config(noreplace) %{_sysconfdir}/%{name}/management/server-nonssl.xml %config(noreplace) %{_sysconfdir}/%{name}/management/server-ssl.xml -%config(noreplace) %{_sysconfdir}/%{name}/management/tomcat-users.xml %config(noreplace) %{_sysconfdir}/%{name}/management/web.xml %config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties %config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties %attr(0755,root,root) %{_initrddir}/%{name}-management -%attr(0755,root,root) %{_initrddir}/tomcat.sh %attr(0755,root,root) %{_bindir}/%{name}-setup-management %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses -%{_datadir}/%{name}-management/webapps -%{_datadir}/%{name}-management/bin %{_datadir}/%{name}-management/conf %{_datadir}/%{name}-management/lib %{_datadir}/%{name}-management/logs -%{_datadir}/%{name}-management/temp -%{_datadir}/%{name}-management/work %attr(0755,root,root) %{_bindir}/%{name}-setup-databases %attr(0755,root,root) %{_bindir}/%{name}-migrate-databases %attr(0755,root,root) %{_bindir}/%{name}-set-guest-password %attr(0755,root,root) %{_bindir}/%{name}-set-guest-sshkey %attr(0755,root,root) %{_bindir}/%{name}-sysvmadm %attr(0755,root,root) %{_bindir}/%{name}-setup-encryption +%{_datadir}/%{name}-management/cloud-management-server.jar %{_datadir}/%{name}-management/setup/*.sql %{_datadir}/%{name}-management/setup/db/*.sql %{_datadir}/%{name}-management/setup/*.sh @@ -629,8 +557,7 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz %dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/ipallocator %{_defaultdocdir}/%{name}-management-%{version}/LICENSE %{_defaultdocdir}/%{name}-management-%{version}/NOTICE -%attr(0644,cloud,cloud) %{_localstatedir}/log/%{name}/management/catalina.out -%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-catalina +#%attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}-catalina %files agent %attr(0755,root,root) %{_bindir}/%{name}-setup-agent diff --git a/packaging/centos63/tomcat.sh b/packaging/centos63/tomcat.sh deleted file mode 100644 index 0908da4..0000000 --- a/packaging/centos63/tomcat.sh +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -. /etc/rc.d/init.d/tomcat6 start diff --git a/packaging/debian/init/cloud-management b/packaging/debian/init/cloud-management index bcd1b18..154d2ca 100755 --- a/packaging/debian/init/cloud-management +++ b/packaging/debian/init/cloud-management @@ -1,6 +1,6 @@ #!/bin/sh # -# /etc/init.d/tomcat6 -- startup script for the Tomcat 6 servlet engine +# /etc/init.d/cloudstack-management -- startup script for the Tomcat 6 servlet engine # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -32,7 +32,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin NAME=cloudstack-management -DESC="CloudStack-specific Tomcat servlet engine" +DESC="CloudStack Management Server" DAEMON=/usr/bin/jsvc MANAGEMENT_HOME=/usr/share/$NAME MANAGEMENT_CONFIG="/etc/cloudstack/management" @@ -83,9 +83,6 @@ export JAVA_HOME # Directory for per-instance configuration files and webapps CATALINA_BASE=/usr/share/cloudstack-management -# Use the Java security manager? (yes/no) -TOMCAT6_SECURITY=no - # Default Java options # Set java.awt.headless=true if JAVA_OPTS is not set so the # Xalan XSL transformer can work without X11 display on JDK 1.4+ -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
