* tentative merge of onelab myplc

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index 96d3763..993b543 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.10 2007/02/05 19:56:26 mlhuang Exp $
+# $Id: httpd 350 2007-05-11 10:58:44Z thierry $
 #
 
 # Source function library and configuration
@@ -36,12 +36,14 @@ case "$1" in
        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.
+       # 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
@@ -135,15 +137,13 @@ 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
+           cat <<EOF
+AddType application/octet-stream .iso
+AddType application/octet-stream .usb
+EOF
        ) >>$plc_conf
 
        # Make alpina-logs directory writable for bootmanager log upload
@@ -195,6 +195,17 @@ define('PLANETLAB_SUPPORT_EMAIL_ONLY', PLC_MAIL_SUPPORT_ADDRESS);
 ?>
 EOF
 
+       ## patch php.ini
+       # memory limit
+       sed -i -e 's,^memory_limit = 8M *;,memory_limit = 24M ; patch myplc -- ,' $php_ini 
+       # log_errors : is On by default
+       # error_log
+       if ! grep '^error_log *=' $php_ini > /dev/null ; then
+         echo 'error_log = /var/log/php.log' >> $php_ini
+         touch /var/log/php.log
+         chmod 666 /var/log/php.log
+       fi
+
        plc_daemon httpd
        check