X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=blobdiff_plain;f=scripts%2Fmir-setup%2Fconf%2Fconfig;h=8dc801c66ac1d390c83288c0efb7e53681af5af4;hp=89c59b5257cea4d18d6599ffa6bb090ffa30931c;hb=665dae34ac91e19dfcb4d2330ac6e1a9280ac0f5;hpb=46afc417dc18313424f13fa1b46d30e28d588fd4

diff --git a/scripts/mir-setup/conf/config b/scripts/mir-setup/conf/config
index 89c59b52..8dc801c6 100755
--- 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"