dumps and cleans the drupal database as well

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index 4427367..f614f51 100755 (executable)
--- 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.11 2007/02/06 16:24:13 mlhuang Exp $
 #
 
 # Source function library and configuration
@@ -35,6 +35,17 @@ case "$1" in
        MESSAGE=$"Starting web server"
        dialog "$MESSAGE"
 
+       # Set the document root to /data/var/www/html (static files
+       # 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
+       else
+           sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
+           rm -f /data$DocumentRoot/PlanetLabConf
+       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
@@ -126,13 +137,7 @@ EOF
 
            if [ "$PLC_WWW_ENABLED" != "1" ] ; then
                cat <<EOF
-<Location /db>
-    Deny from all
-</Location>
-<Location /planetlab>
-    Deny from all
-</Location>
-Redirect /index.php http://$PLC_WWW_HOST:$PLC_WWW_PORT/
+Redirect /index.html http://$PLC_WWW_HOST:$PLC_WWW_PORT/
 EOF
            fi
        ) >>$plc_conf