* scripts/mir-setup/conf: updated to use tomcat5.5

[mir.git] / scripts / mir-setup / conf / config

diff --git a/scripts/mir-setup/conf/config b/scripts/mir-setup/conf/config
index 89c59b5..8dc801c 100755 (executable)
--- a/scripts/mir-setup/conf/config
+++ b/scripts/mir-setup/conf/config
@@ -1,4 +1,4 @@
-# $Id: config,v 1.1.2.1 2006/11/11 12:52:06 zak Exp $
+# $Id: config,v 1.1.2.2 2009/01/18 03:41:13 ianb Exp $
 
 # System configuration file for mir-setup script
 
@@ -27,12 +27,12 @@ if [ -z "$MIRVERSION" ]; then MIRVERSION=MIR_1_1; fi
 APACHECONFDIR=/etc/apache2/mir-sites
 
 APACHECTL=/usr/sbin/apache2ctl
-WEBAPPSDIR=/var/lib/tomcat4/webapps
-TOMCATSCRIPT=/etc/init.d/tomcat4
-TOMCATUSER=tomcat4
+WEBAPPSDIR=/var/lib/tomcat5.5/webapps
+TOMCATSCRIPT=/etc/init.d/tomcat5.5
+TOMCATUSER=tomcat55
 
 # May be overridden
-if [ -z "$TOMCATGROUP" ]; then TOMCATGROUP=tomcat4; fi
+if [ -z "$TOMCATGROUP" ]; then TOMCATGROUP=tomcat55; fi
 
 # Include environment settings
 source "$CONFDIR/env"