From: Stephen Soltesz <soltesz@cs.princeton.edu>
Date: Tue, 14 Apr 2009 18:55:16 +0000 (+0000)
Subject: merged with trunk
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a7e7a22251bf0f43603c33c1652b98cac5efaa60;p=myplc.git

merged with trunk
---

diff --git a/plc.d/httpd b/plc.d/httpd
index 5078c0e..9c30dea 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -39,8 +39,13 @@ case "$1" in
 	# and PlanetLabConf 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
-	    ln -nsf $DocumentRoot/PlanetLabConf /data$DocumentRoot/PlanetLabConf
+	    if [ -d "/data" ] ; then 
+	    	sed -i -e "s@^DocumentRoot.*@DocumentRoot \"/data$DocumentRoot\"@" $httpd_conf
+	    	ln -nsf $DocumentRoot/PlanetLabConf /data$DocumentRoot/PlanetLabConf
+		else
+			# NOTE: otherwise, the paths are correct by default.
+			/bin/true
+		fi
 	else
 	    sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
 	    rm -f /data$DocumentRoot/PlanetLabConf