You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/10/10 17:52:11 UTC
[1/2] git commit: debian: Package symlinks and config files for AWS
API
Updated Branches:
refs/heads/4.0 38dca7c9c -> 3854de46c
debian: Package symlinks and config files for AWS API
We should not do any of these things on postinst files, this will lead to garbage
staying behind when removing the package, confusing sysadmins
By creating the symlinks on the rules file they will get added into the DEB package
and cleaned up should the package be removed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3854de46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3854de46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3854de46
Branch: refs/heads/4.0
Commit: 3854de46ce6e2eaf81de695c31e37f0f77228938
Parents: c446c45
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Wed Oct 10 17:50:27 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Wed Oct 10 17:50:27 2012 +0200
----------------------------------------------------------------------
debian/cloud-awsapi.postinst | 15 ++-------------
debian/rules | 6 ++++++
2 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3854de46/debian/cloud-awsapi.postinst
----------------------------------------------------------------------
diff --git a/debian/cloud-awsapi.postinst b/debian/cloud-awsapi.postinst
index b0f4ac1..fe8f649 100644
--- a/debian/cloud-awsapi.postinst
+++ b/debian/cloud-awsapi.postinst
@@ -18,17 +18,6 @@
case "$1" in
configure)
- 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
+ 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/3854de46/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 460e5aa..677d71a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,6 +84,12 @@ 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