# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1299351135 -3600
# Node ID a7135e3461b76460dd1378f5157e1103f2ceb016
# Parent  9d55ddb58359f8cdcc518a7349d30a8598789879
Fix tazchroot default config

diff -r 9d55ddb58359 -r a7135e3461b7 tazchroot/tazchroot.conf
--- a/tazchroot/tazchroot.conf	Sat Mar 05 18:19:18 2011 +0000
+++ b/tazchroot/tazchroot.conf	Sat Mar 05 19:52:15 2011 +0100
@@ -26,7 +26,7 @@
 # Here we use the default setup.
 # The host system needs php installed to make it works.
 # Uncomment to following line to use this option.
-#WEBSERVER="/var/www/vhosts/bb"
+WEBSERVER="/var/www/vhosts/bb"
 
 # Default scripts path (theses scripts are added in the
 # $chroot_dir/usr/bin and can be called with tazchroot script)
@@ -57,10 +57,11 @@
 	tazpkg recharge
 
 	# Install needed packages.
+	mkdir -p $chroot_dir
 	tazpkg get-install busybox --root="$chroot_dir"
 	tazpkg get-install tazchroot --root="$chroot_dir"
 	tazpkg get-install tazpkg --root="$chroot_dir"
-	tazpkg get-install tazwok-experimental --root="$chroot_dir"
+	tazpkg get-install tazwok --root="$chroot_dir"
 	tazpkg get-install libtaz --root="$chroot_dir"
 
 	rm -r $LOCALSTATE/undigest/tmp.$SLITAZ_VERSION.mirror
@@ -85,10 +86,16 @@
 	echo "$SLITAZ_VERSION" > "$chroot_dir/etc/slitaz-release"
 
 	# Webserver setup.
-	mkdir -p /usr/lib/slitaz
-	[ -d /usr/lib/slitaz/web-bb ] ||
-	ln -s $chroot_dir/usr/lib/slitaz/web-bb /usr/lib/slitaz/web-bb
+	if [ "$WEBSERVER" ]; then
+		mkdir -p /usr/lib/slitaz
+		[ -d /usr/share/slitaz/web-bb ] || [ -L /usr/share/slitaz/web-bb ] ||
+		ln -s $chroot_dir/usr/share/slitaz/web-bb /usr/share/slitaz/web-bb
 
+		# Make tazwok act as php/lighttpd were installed into the sandbox.
+		mkdir -p $chroot_dir$INSTALLED/php
+		mkdir -p $chroot_dir$INSTALLED/lighttpd
+	fi
+	
 	# Mount system directories
 	mount -t proc proc $chroot_dir/proc
 	mount -t sysfs sysfs $chroot_dir/sys