apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

debian: Include jasypt in the cloudstack-common package

Browse Source 
This is required for the cloud-install-sys-tmplt installer.

Signed-off-by: Wido den Hollander <wido@42on.com>
This commit is contained in:
Wido den Hollander 2013-03-30 16:32:08 +01:00
parent 5a16e70de9
commit 29baacd120
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/cloudstack-common.install vendored
View File

@ -26,6 +26,7 @@
/usr/share/cloudstack-common/scripts/vm/hypervisor/kvm/* /usr/share/cloudstack-common/scripts/vm/hypervisor/kvm/*
/usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh /usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh
/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/* /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/*
/usr/share/cloudstack-common/lib/*
/usr/bin/cloud-set-guest-password /usr/bin/cloud-set-guest-password
/usr/bin/cloud-set-guest-sshkey /usr/bin/cloud-set-guest-sshkey
/usr/lib/python2.?/*-packages/* /usr/lib/python2.?/*-packages/*

3
debian/rules vendored
View File

@ -116,6 +116,7 @@ install:
mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-common mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-common
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/setup mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/setup
mkdir $(DESTDIR)/usr/share/$(PACKAGE)-common/lib
cp -r scripts/installer $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts cp -r scripts/installer $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
cp -r scripts/network $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts cp -r scripts/network $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
cp -r scripts/storage $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts cp -r scripts/storage $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts
@ -127,6 +128,8 @@ install:
install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin
install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin
install -D client/target/cloud-client-ui-$(VERSION)-SNAPSHOT/WEB-INF/classes/vms/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso install -D client/target/cloud-client-ui-$(VERSION)-SNAPSHOT/WEB-INF/classes/vms/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso
# We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the right place
install -D agent/target/dependencies/jasypt-1.9.0.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib
# cloudstack-python # cloudstack-python
mkdir -p $(DESTDIR)/usr/lib/python2.7/dist-packages mkdir -p $(DESTDIR)/usr/lib/python2.7/dist-packages

2
scripts/storage/secondary/cloud-install-sys-tmplt
View File

@ -40,7 +40,7 @@ DISKSPACE=5120000 #free disk space required in kilobytes
dbHost= dbHost=
dbUser= dbUser=
dbPassword= dbPassword=
jasypt='/usr/share/java/jasypt-1.9.0.jar' jasypt='/usr/share/cloudstack-common/lib/jasypt-1.9.0.jar'
while getopts 'm:h:f:u:Ft:e:s:o:r:d' OPTION while getopts 'm:h:f:u:Ft:e:s:o:r:d' OPTION
do do
case $OPTION in case $OPTION in