[10/50] git commit: CloudStack CLOUDSTACK-257 AWS Api is not correctly deployed

[ke...@apache.org]

CloudStack CLOUDSTACK-257
AWS Api is not correctly deployed

resolved fixed


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

Branch: refs/heads/javelin
Commit: f03a901e465315a8f6be7d4653828ab0675b5a0f
Parents: a5bca09
Author: frank <fr...@citrix.com>
Authored: Sun Oct 7 12:35:44 2012 -0700
Committer: Alex Huang <al...@citrix.com>
Committed: Mon Oct 8 00:05:11 2012 -0700

----------------------------------------------------------------------
 cloud.spec |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f03a901e/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index d004331..bad9a63 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -393,18 +393,15 @@ if [ -x /etc/sysconfig/modules/kvm.modules ] ; then
 fi
 
 %post client
-if [ "$1" == "1" ] ; then
     /sbin/chkconfig --add %{name}-management > /dev/null 2>&1 || true
     /sbin/chkconfig --level 345 %{name}-management on > /dev/null 2>&1 || true
-fi
 
-if [ "$1" == "1" ] ; then
     root=/usr/share/cloud/bridge
     target=/usr/share/cloud/management/
 
     mkdir -p $target/webapps7080
     if [ ! -e $target/webapps7080/awsapi ]; then
-        ln -s $root/webapps/awsapi $target/webapps7080/awsapi
+        ln -s $root/webapps7080/awsapi $target/webapps7080/awsapi
     fi
 
     jars=`ls $root/lib`
@@ -418,7 +415,6 @@ if [ "$1" == "1" ] ; then
     do
         cp -f $root/conf/$c $target/conf
     done
-fi
 
 %files utils
 %defattr(0644,root,root,0755)
@@ -604,6 +600,7 @@ fi
 %defattr(0644,cloud,cloud,0755)
 %{_datadir}/cloud/bridge/conf/*
 %{_datadir}/cloud/bridge/webapps7080/*
+%{_datadir}/cloud/bridge/lib/*
 %attr(0644,root,root) %{_datadir}/cloud/setup/bridge/db/*
 %attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register
 %attr(0755,root,root) %{_bindir}/cloud-setup-bridge