Author: jfrederic.clere(a)jboss.com Date: 2009-01-20 10:17:57 -0500 (Tue, 20 Jan 2009) New Revision: 2186 Modified: trunk/mod_cluster/test/java/installhttpd.sh Log: Finish arranging location for windoze. Modified: trunk/mod_cluster/test/java/installhttpd.sh =================================================================== --- trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 14:43:04 UTC (rev 2185) +++ trunk/mod_cluster/test/java/installhttpd.sh 2009-01-20 15:17:57 UTC (rev 2186) @@ -75,6 +75,8 @@ BUILD_TAG=${BUILD_SYS}-${BUILD_CPU} EXT=tar.gz BASEHTTPD=opt/jboss/httpd +BASEHTTPDCONF=opt/jboss/httpd/httpd/conf +BASEHTTPDSBIN=opt/jboss/httpd/sbin case $BUILD_TAG in *hpux-parisc2*) BASE=mod_cluster-hp-ux-9000_800 @@ -101,6 +103,8 @@ BASE=mod_cluster-windows EXT=zip BASEHTTPD=httpd-2.2 + BASEHTTPDCONF=httpd-2.2/conf + BASEHTTPDSBIN=httpd-2.2/bin ;; esac #PACKAGE=rhel-httpd-2.2.8-1.el5s2 @@ -141,39 +145,39 @@ (cd $BASELOC gzip -dc ${TARBALL} | tar xvf - ) + # Arrange the installed files + files="${BASEHTTPDSBIN}/apachectl ${BASEHTTPDCONF}/httpd.conf ${BASEHTTPDSBIN}/envvars" + for FILE in `echo $files` + do + file=${BASELOC}/$FILE + echo "$file" + cp -p $file $file.new + sed "s:${BASEHTTPD}:${BASELOC}/${BASEHTTPD}:" $file > $file.new + mv $file $file.`date +%y%m%d.%H%M%S`.org + mv $file.new $file + done + # Arrange apachectl + file=$BASELOC/${BASEHTTPDSBIN}/apachectl + cp -p $file $file.new + echo "s:\$HTTPD -k \$ARGV:\$HTTPD -k \$ARGV -d ${BASELOC}/${BASEHTTPD}/httpd:" > sed.cmd + sed -f sed.cmd $file > $file.new + mv $file $file.`date +%y%m%d.%H%M%S`.1.org + mv $file.new $file ;; *) (cd $BASELOC unzip ${TARBALL} ) + # Arrange the installed files (cd $BASELOC/httpd-2.2/bin ./installconf.bat ) ;; esac + # -# Arrange the installed files -# -files="${BASEHTTPD}/sbin/apachectl ${BASEHTTPD}/httpd/conf/httpd.conf ${BASEHTTPD}/sbin/envvars" -for FILE in `echo $files` -do - file=${BASELOC}/$FILE - echo "$file" - cp -p $file $file.new - sed "s:${BASEHTTPD}:${BASELOC}/${BASEHTTPD}:" $file > $file.new - mv $file $file.`date +%y%m%d.%H%M%S`.org - mv $file.new $file -done -# Arrange apachectl -file=$BASELOC/${BASEHTTPD}/sbin/apachectl -cp -p $file $file.new -echo "s:\$HTTPD -k \$ARGV:\$HTTPD -k \$ARGV -d ${BASELOC}/${BASEHTTPD}/httpd:" > sed.cmd -sed -f sed.cmd $file > $file.new -mv $file $file.`date +%y%m%d.%H%M%S`.1.org -mv $file.new $file - # Arrange httpd.conf -file=$BASELOC/${BASEHTTPD}/httpd/conf/httpd.conf +file=$BASELOC/${BASEHTTPDCONF}/httpd.conf cp -p $file $file.new echo "s/Listen 80/Listen @IP@:8000/" > sed.cmd echo "s/LoadModule proxy_balancer/#LoadModule proxy_balancer/" >> sed.cmd @@ -207,5 +211,5 @@ mv $file.new.1 $file # restore the execute permissions. -chmod a+x $BASELOC/${BASEHTTPD}/sbin/* +chmod a+x $BASELOC/${BASEHTTPDSBIN}/* chmod a+x $BASELOC/${BASEHTTPD}/bin/*