From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Tue, 6 Feb 2007 16:24:13 +0000 (+0000)
Subject: Set the document root to /data/var/www/html (static files
X-Git-Tag: planetlab-4_0-rc1~8
X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=de3e713546999dd115ac713c27c205196f40b649

Set the document root to /data/var/www/html (static files
only, no Drupal or admin pages) if the web server should not
run on this machine.
---

diff --git a/plc.d/httpd b/plc.d/httpd
index 4427367..96d3763 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: httpd,v 1.9 2007/02/02 15:37:25 mlhuang Exp $
+# $Id: httpd,v 1.10 2007/02/05 19:56:26 mlhuang Exp $
 #
 
 # Source function library and configuration
@@ -35,6 +35,15 @@ case "$1" in
 	MESSAGE=$"Starting web server"
 	dialog "$MESSAGE"
 
+	# Set the document root to /data/var/www/html (static files
+	# only, no Drupal or admin pages) if the web server should not
+	# run on this machine.
+	if [ "$PLC_WWW_ENABLED" != "1" ] ; then
+	    sed -i -e "s@^DocumentRoot.*@DocumentRoot \"/data$DocumentRoot\"@" $httpd_conf
+	else
+	    sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
+	fi
+
 	# Set the default include path
 	include_path=".:$DocumentRoot/planetlab/includes:$DocumentRoot/generated:/etc/planetlab/php:/usr/share/plc_api/php"
 	sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini