You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/10/10 23:42:51 UTC
git commit: This fix doesn't work,
no link been created on fresh installation ubuntu Revert "debian:
Package symlinks and config files for AWS API"
Updated Branches:
refs/heads/4.0 de179b3a3 -> 5ee613fbf
This fix doesn't work, no link been created on fresh installation ubuntu
Revert "debian: Package symlinks and config files for AWS API"
This reverts commit 3854de46ce6e2eaf81de695c31e37f0f77228938.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/5ee613fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/5ee613fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/5ee613fb
Branch: refs/heads/4.0
Commit: 5ee613fbf2da5f6212f2f166c980506e0c6cb5cb
Parents: de179b3
Author: Edison Su <ed...@citrix.com>
Authored: Wed Oct 10 14:41:37 2012 -0700
Committer: Edison Su <ed...@citrix.com>
Committed: Wed Oct 10 14:41:37 2012 -0700
----------------------------------------------------------------------
debian/cloud-awsapi.postinst | 15 +++++++++++++--
debian/rules | 6 ------
2 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ee613fb/debian/cloud-awsapi.postinst
----------------------------------------------------------------------
diff --git a/debian/cloud-awsapi.postinst b/debian/cloud-awsapi.postinst
index fe8f649..b0f4ac1 100644
--- a/debian/cloud-awsapi.postinst
+++ b/debian/cloud-awsapi.postinst
@@ -18,6 +18,17 @@
case "$1" in
configure)
- chown cloud:cloud /usr/share/cloud/bridge/webapps7080/awsapi -R
- chmod 755 /usr/share/cloud/bridge/webapps7080/awsapi -R
+ mkdir -p /usr/share/cloud/management/webapps7080
+ if [ ! -h /usr/share/cloud/management/webapps7080/awsapi ]; then
+ ln -sf /usr/share/cloud/bridge/webapps7080/awsapi /usr/share/cloud/management/webapps7080/awsapi
+ fi
+ confs="cloud-bridge.properties ec2-service.properties"
+ for c in $confs
+ do
+ cp -f /usr/share/cloud/bridge/conf/$c /usr/share/cloud/management/conf
+ done
+ chown cloud:cloud /usr/share/cloud/bridge/webapps7080/awsapi -R
+ chmod 755 /usr/share/cloud/bridge/webapps7080/awsapi -R
esac
+
+#DEBHELPER#
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/5ee613fb/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 677d71a..460e5aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,12 +84,6 @@ install-arch:
./waf install --destdir=$(CURDIR)/debian/tmp install --nochown --build-number=$(BUILDNUMBER)
ant deploy-rpm-install -Drpm.install.dir=$(CURDIR)/debian/tmp
- # Some stuff for AWS API so we don't have to do this in the postinst
- mkdir $(CURDIR)/debian/tmp/usr/share/cloud/management/webapps7080
- ln -s /usr/share/cloud/bridge/webapps7080/awsapi $(CURDIR)/debian/tmp/usr/share/cloud/management/webapps7080/awsapi
- ln -s /usr/share/cloud/bridge/conf/cloud-bridge.properties $(CURDIR)/debian/tmp/etc/cloud/management/cloud-bridge.properties
- ln -s /usr/share/cloud/bridge/conf/ec2-service.properties $(CURDIR)/debian/tmp/etc/cloud/management/ec2-service.properties
-
dh_install -s
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep