Updated Branches: refs/heads/4.2 1c3b9b53f -> 385592237
Remove cloudmanagementserver.keystore from installation Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/38559223 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/38559223 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/38559223 Branch: refs/heads/4.2 Commit: 38559223780fa0471f9b497102c3c727ae47382f Parents: 1c3b9b5 Author: Wei Zhou <w.z...@leaseweb.com> Authored: Mon Nov 11 18:10:06 2013 +0100 Committer: Wei Zhou <w.z...@leaseweb.com> Committed: Mon Nov 11 18:10:06 2013 +0100 ---------------------------------------------------------------------- debian/cloudstack-management.install | 1 - packaging/centos63/cloud.spec | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38559223/debian/cloudstack-management.install ---------------------------------------------------------------------- diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install index a1325cd..ff461c6 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 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/38559223/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 8f47ebb..cef197e 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -266,7 +266,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 @@ -465,7 +465,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 @@ -561,7 +560,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
