--- /usr/sbin/webapp-config	2005/03/25 13:40:38	1.1
+++ /usr/sbin/webapp-config	2005/03/25 13:59:48
@@ -76,6 +76,7 @@
 G_PN=
 G_PVR=
 G_HOSTNAME="${VHOST_HOSTNAME:-localhost}"
+G_VHOST_ROOT="${VHOST_ROOT:-/var/www/${G_HOSTNAME}}"
 G_CONFIG_UID="${VHOST_CONFIG_UID:-root}"
 G_CONFIG_GID="${VHOST_CONFIG_GID:-root}"
 G_VIRTUAL_DIRS="${VHOST_CONFIG_VIRTUAL_DIRS:-virtual}"
@@ -109,6 +110,7 @@
 G_F_GROUP=0
 G_F_DIR=0
 G_F_HOST=0
+G_F_VHOST_ROOT=0
 G_F_VIRTUAL_DIRS=0
 G_F_VIRTUAL_FILES=0
 G_F_FORCE_VIRTUAL=0
@@ -351,7 +353,7 @@
 	# step 2 - check to make sure that all the required user-configurable
 	# variables have values
 
-	for x in VHOST_ROOT VHOST_HOSTNAME VHOST_SERVER VHOST_CONFIG_UID VHOST_CONFIG_GID VHOST_CONFIG_VIRTUAL_DIRS VHOST_CONFIG_VIRTUAL_FILES VHOST_CONFIG_DIR VHOST_DEFAULT_UID VHOST_DEFAULT_GID VHOST_HTDOCS_INSECURE VHOST_HTDOCS_SECURE ; do
+	for x in VHOST_HOSTNAME VHOST_SERVER VHOST_CONFIG_UID VHOST_CONFIG_GID VHOST_CONFIG_VIRTUAL_DIRS VHOST_CONFIG_VIRTUAL_FILES VHOST_CONFIG_DIR VHOST_DEFAULT_UID VHOST_DEFAULT_GID VHOST_HTDOCS_INSECURE VHOST_HTDOCS_SECURE ; do
 		fn_check_isset "${!x}" "$x" "missing user-configurable variable '$x'"
 	done
 
@@ -2178,6 +2180,11 @@
 				G_F_HOST=1
 				shift
 				;;
+			-r|--vhost-root) 
+				G_VHOST_ROOT="$2"
+				G_F_VHOST_ROOT=1
+				shift
+				;;
 			--show-postinst)
 				G_WORK="show_postinst"
 				G_F_SHOW_POSTINST=1
@@ -2601,12 +2608,12 @@
 	export MY_SERVERCONFIGDIR
 	export MY_ERRORSDIR
 	export MY_SQLSCRIPTSDIR
-	export VHOST_ROOT
+	export VHOST_ROOT="$G_VHOST_ROOT"
 	export VHOST_HTDOCSDIR="$G_HTDOCSDIR"
-	export VHOST_CGIBINDIR="${VHOST_ROOT}/${MY_CGIBINBASE}"
-	export VHOST_CONFDIR="${VHOST_ROOT}/${MY_CONFBASE}"
-	export VHOST_ERRORSDIR="${VHOST_ROOT}/${MY_ERRORSBASE}"
-	export VHOST_ICONSDIR="${VHOST_ROOT}/${MY_ICONSBASE}"
+	export VHOST_CGIBINDIR="${G_VHOST_ROOT}/${MY_CGIBINBASE}"
+	export VHOST_CONFDIR="${G_VHOST_ROOT}/${MY_CONFBASE}"
+	export VHOST_ERRORSDIR="${G_VHOST_ROOT}/${MY_ERRORSBASE}"
+	export VHOST_ICONSDIR="${G_VHOST_ROOT}/${MY_ICONSBASE}"
 	export VHOST_HOSTNAME
 	export VHOST_SERVER="$G_SERVER"
 	export VHOST_APPDIR="$G_ORIG_INSTALLDIR"
@@ -2867,6 +2874,7 @@
 	libsh_everbose libsh_einfo "  --user          is $G_CONFIG_UID"
 	libsh_everbose libsh_einfo "  --group         is $G_CONFIG_GID"
 	libsh_everbose libsh_einfo "  --hostname      is $G_HOSTNAME"
+	libsh_everbose libsh_einfo "  --vhost-root    is $G_VHOST_ROOT"
 	libsh_everbose libsh_einfo "  --server        is $G_SERVER"
 	libsh_everbose libsh_einfo "  --directory     is $G_INSTALLDIR"
 	libsh_everbose libsh_einfo "  package         is $G_PN"