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 15:43:58 UTC
[cloudstack] branch CLOUDSTACK-10012 updated: centos7: fix missing
paths
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 d46f506 centos7: fix missing paths
d46f506 is described below
commit d46f5062371cedf179e427a39746387d140447fd
Author: Rohit Yadav <ro...@shapeblue.com>
AuthorDate: Mon Aug 7 17:43:40 2017 +0200
centos7: fix missing paths
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
---
packaging/centos7/cloud.spec | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index 56a6ca4..b757bdd 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -231,7 +231,6 @@ 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
@@ -265,13 +264,9 @@ 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
do
- mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \
- ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
+ 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
-
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
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].