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 2013/04/03 12:33:23 UTC
[15/50] [abbrv] git commit: updated refs/heads/kvm-vnc-listen to
3890860
debian: Update the init script for the management server
Signed-off-by: Wido den Hollander <wi...@42on.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bc1ce57c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bc1ce57c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bc1ce57c
Branch: refs/heads/kvm-vnc-listen
Commit: bc1ce57c9b75029399b8842c7bd4818c3465ee3e
Parents: 29baacd
Author: Wido den Hollander <wi...@42on.com>
Authored: Sat Mar 30 20:09:56 2013 +0100
Committer: Wido den Hollander <wi...@42on.com>
Committed: Sun Mar 31 14:16:31 2013 +0200
----------------------------------------------------------------------
packaging/debian/init/cloud-management | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc1ce57c/packaging/debian/init/cloud-management
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-management b/packaging/debian/init/cloud-management
index 69a0428..3ebaa73 100755
--- a/packaging/debian/init/cloud-management
+++ b/packaging/debian/init/cloud-management
@@ -19,7 +19,7 @@
# specific language governing permissions and limitations
# under the License.
### BEGIN INIT INFO
-# Provides: tomcat-vmops
+# Provides: cloudstack-management
# Required-Start: $local_fs $remote_fs $network
# Required-Stop: $local_fs $remote_fs $network
# Should-Start: $named
@@ -34,7 +34,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
NAME=cloudstack-management
DESC="CloudStack-specific Tomcat servlet engine"
DAEMON=/usr/bin/jsvc
-CATALINA_HOME=/usr/share/cloudstack/management
+CATALINA_HOME=/usr/share/cloudstack-management
DEFAULT=/etc/cloudstack/management/tomcat6.conf
JVM_TMP=/tmp/$NAME-temp
@@ -65,7 +65,7 @@ TOMCAT6_USER=tomcat6
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
-JDK_DIRS="/usr/lib/jvm/java-1.6.0-openjdk-amd64/ /usr/lib/jvm/java-1.6.0-openjdk-i386/ /usr/lib/jvm/java-1.6.0-openjdk/ /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-sun"
+JDK_DIRS="/usr/lib/jvm/java-7-openjdk-amd64 /usr/lib/jvm/java-7-openjdk-i386 /usr/lib/jvm/java-6-openjdk /usr/lib/jvm/java-6-openjdk-i386 /usr/lib/jvm/java-6-openjdk-amd64 /usr/lib/jvm/java-6-sun"
# Look for the right JVM to use
for jdir in $JDK_DIRS; do
@@ -76,7 +76,7 @@ done
export JAVA_HOME
# Directory for per-instance configuration files and webapps
-CATALINA_BASE=/usr/share/cloudstack/management
+CATALINA_BASE=/usr/share/cloudstack-management
# Use the Java security manager? (yes/no)
TOMCAT6_SECURITY=no