From eb4c52ebca6d142a27e0b8eff5cf1c09ddf52bf9 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 11 Nov 2013 18:10:06 +0100 Subject: [PATCH] Remove cloudmanagementserver.keystore from installation (cherry picked from commit 38559223780fa0471f9b497102c3c727ae47382f) --- debian/cloudstack-management.install | 1 - packaging/centos63/cloud.spec | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install index f06ab86dda1..ea3f93ba0cb 100644 --- a/debian/cloudstack-management.install +++ b/debian/cloudstack-management.install @@ -17,7 +17,6 @@ /etc/cloudstack/management/catalina.policy /etc/cloudstack/management/catalina.properties -/etc/cloudstack/management/cloudmanagementserver.keystore /etc/cloudstack/management/logging.properties /etc/cloudstack/management/commands.properties /etc/cloudstack/management/ehcache.xml diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index cd6ff4bfbe2..893628d55d2 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -252,7 +252,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl 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 \ - catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties cloudmanagementserver.keystore ; do + catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties ; do mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \ ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name done @@ -451,7 +451,6 @@ else fi if [ -f "%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore" ]; then - mv %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore.rpmnew 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 mv %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore.rpmsave @@ -546,7 +545,6 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties %config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties %config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties -%config(noreplace) %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore %attr(0755,root,root) %{_initrddir}/%{name}-management %attr(0755,root,root) %{_bindir}/%{name}-setup-management %attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses