cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject git commit: updated refs/heads/master to eb4c52e
Date Mon, 11 Nov 2013 17:11:15 GMT
Updated Branches:
  refs/heads/master aebbb15a6 -> eb4c52ebc


Remove cloudmanagementserver.keystore from installation
(cherry picked from commit 38559223780fa0471f9b497102c3c727ae47382f)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/eb4c52eb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/eb4c52eb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/eb4c52eb

Branch: refs/heads/master
Commit: eb4c52ebca6d142a27e0b8eff5cf1c09ddf52bf9
Parents: aebbb15
Author: Wei Zhou <w.zhou@leaseweb.com>
Authored: Mon Nov 11 18:10:06 2013 +0100
Committer: Wei Zhou <w.zhou@leaseweb.com>
Committed: Mon Nov 11 18:11: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/eb4c52eb/debian/cloudstack-management.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index f06ab86..ea3f93b 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/eb4c52eb/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index cd6ff4b..893628d 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


Mime
View raw message