You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/08/07 23:10:28 UTC
[cloudstack] branch CLOUDSTACK-10012 updated: packaging: fix centos
pkging
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
The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
new 846d959 packaging: fix centos pkging
846d959 is described below
commit 846d959b7b8ac6ee3f74184319bfa8204ca6238c
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Tue Aug 8 01:10:14 2017 +0200
packaging: fix centos pkging
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
packaging/centos63/cloud.spec | 9 ++++-----
packaging/centos7/cloud.spec | 9 +++------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 6202c25..d1deca2 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -292,8 +292,10 @@ cp client/target/bcprov-jdk15on-1.55.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
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 server-ssl.xml server-nonssl.xml commons-logging.properties \
- classpath.conf web.xml environment.properties java.security.ciphers; do
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+
+for name in db.properties log4j-cloud.xml commons-logging.properties environment.properties java.security.ciphers
+do
cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
done
@@ -529,9 +531,6 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
%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/classpath.conf
-%config(noreplace) %{_sysconfdir}/%{name}/management/server-nonssl.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/server-ssl.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 9a11aef..41d452b 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -262,9 +262,9 @@ cp client/target/bcprov-jdk15on-1.55.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-ma
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 server7-nonssl.xml server7-ssl.xml \
- commons-logging.properties classpath.conf \
- web.xml environment.properties java.security.ciphers
+cp client/target/classes/META-INF/webapp/WEB-INF/web.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/
+
+for name in db.properties log4j-cloud.xml commons-logging.properties environment.properties java.security.ciphers
do
cp client/target/conf/$name ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
done
@@ -473,9 +473,6 @@ pip install --upgrade /usr/share/cloudstack-marvin/Marvin-*.tar.gz
%config(noreplace) %{_sysconfdir}/security/limits.d/cloud
%config(noreplace) %attr(0640,root,cloud) %{_sysconfdir}/%{name}/management/db.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/log4j-cloud.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/classpath.conf
-%config(noreplace) %{_sysconfdir}/%{name}/management/server7-nonssl.xml
-%config(noreplace) %{_sysconfdir}/%{name}/management/server7-ssl.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/web.xml
%config(noreplace) %{_sysconfdir}/%{name}/management/environment.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/java.security.ciphers
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].