cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject git commit: updated refs/heads/master to 37ca436
Date Tue, 14 May 2013 09:07:20 GMT
Updated Branches:
  refs/heads/master 80c2ea769 -> 37ca43684


CLOUDSTACK-2440 Print a warning if the rpm can't determine the previous configuration for
server.xml or tomcat.conf


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

Branch: refs/heads/master
Commit: 37ca43684b50519405990b4470e6615711202edc
Parents: 80c2ea7
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Authored: Tue May 14 11:03:13 2013 +0200
Committer: Hugo Trippaers <htrippaers@schubergphilis.com>
Committed: Tue May 14 11:05:04 2013 +0200

----------------------------------------------------------------------
 packaging/centos63/cloud.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/37ca4368/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index f0c6e3c..1cde336 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -399,6 +399,8 @@ if [ -L $oldserverxml ] ; then
         if [ -L $serverxml ]; then rm -f $serverxml; fi
         ln -s %{_sysconfdir}/%{name}/management/server-ssl.xml $serverxml
     fi
+else
+    echo "Unable to determine ssl settings for server.xml, please run cloudstack-setup-management
manually"
 fi
 
 tomcatconf=%{_sysconfdir}/%{name}/management/tomcat6.conf
@@ -411,6 +413,8 @@ if [ -L $oldtomcatconf ] ; then
         if [ -L $tomcatconf ]; then rm -f $tomcatconf; fi
         ln -s %{_sysconfdir}/%{name}/management/tomcat6-ssl.conf $tomcatconf
     fi
+else
+    echo "Unable to determine ssl settings for tomcat.conf, please run cloudstack-setup-management
manually"
 fi
 
 %preun agent


Mime
View raw message