From bfc8ffcd27c8882503747cc56cfa0c29389d2b00 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Wed, 3 Apr 2013 15:46:37 +0200 Subject: [PATCH 1/2] debian: Update the cloudstack-management server's classpath It should contain /etc/cloudstack/management so it can locate it's configuration --- packaging/debian/init/cloud-management | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packaging/debian/init/cloud-management b/packaging/debian/init/cloud-management index 3ebaa738861..1e008312e09 100755 --- a/packaging/debian/init/cloud-management +++ b/packaging/debian/init/cloud-management @@ -125,8 +125,7 @@ fi # Define other required variables CATALINA_PID="/var/run/$NAME.pid" BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap -JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar" -JSVC_CLASSPATH=$CLASSPATH:$JSVC_CLASSPATH +JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar:/etc/cloudstack/management" # Look for Java Secure Sockets Extension (JSSE) JARs if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then From fb8ea75707648ea7abe7a00843bfea12e98fb50e Mon Sep 17 00:00:00 2001 From: Hugo Trippaers Date: Fri, 5 Apr 2013 17:08:15 +0200 Subject: [PATCH 2/2] packaging: Three times is a charm Sorry about this, my packaging test system is out of order :-( (cherry picked from commit 171a967437431dca420b33ebf62a249876eeb05f) Signed-off-by: Hugo Trippaers --- packaging/centos63/cloud.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 118f20a7a9d..8971831291b 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -513,6 +513,7 @@ fi %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloud_utils.py %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloud_utils.pyc %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudutils/* +%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.0.jar %doc LICENSE %doc NOTICE