cleanup code for old chroot jail and deprecated /data area - turn drupal down when...

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index f614f51..76132b3 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.11 2007/02/06 16:24:13 mlhuang Exp $
+# $Id$
 #
 
 # Source function library and configuration
@@ -24,6 +24,15 @@ httpd_conf=/etc/httpd/conf/httpd.conf
 ssl_conf=/etc/httpd/conf.d/ssl.conf
 plc_conf=/etc/httpd/conf.d/plc.conf
 
+function disable_file () {
+    file=$1; shift
+    [ -f $file ] && mv -f $file $file.disabled
+}
+function enable_file () {
+    file=$1; shift
+    [ ! -f $file ] && mv -f $file.disabled $file
+}
+
 case "$1" in
     start)
        if [ "$PLC_API_ENABLED" != "1" -a \
@@ -35,19 +44,18 @@ 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.
+       # set document root - not really useful on fedora but just in case
+       sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
+       # whether WWW is enabled or not : 
        if [ "$PLC_WWW_ENABLED" != "1" ] ; then
-           sed -i -e "s@^DocumentRoot.*@DocumentRoot \"/data$DocumentRoot\"@" $httpd_conf
-           ln -nsf $DocumentRoot/PlanetLabConf /data$DocumentRoot/PlanetLabConf
+           # avoid hitting drupal, that would try to connect to the db and create noise
+           disable_file $DocumentRoot/index.php
        else
-           sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
-           rm -f /data$DocumentRoot/PlanetLabConf
+           enable_file $DocumentRoot/index.php
        fi
 
        # Set the default include path
-       include_path=".:$DocumentRoot/planetlab/includes:$DocumentRoot/generated:/etc/planetlab/php:/usr/share/plc_api/php"
+       include_path=".:$DocumentRoot/planetlab/includes:$DocumentRoot/plekit/php:$DocumentRoot/generated:/etc/planetlab/php:/usr/share/plc_api/php"
        sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini
 
        # Disable default Listen directive
@@ -140,6 +148,10 @@ EOF
 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
@@ -191,6 +203,17 @@ define('PLANETLAB_SUPPORT_EMAIL_ONLY', PLC_MAIL_SUPPORT_ADDRESS);
 ?>
 EOF
 
+       ## patch php.ini
+       # memory limit
+       sed -i -e 's,^memory_limit = 32M *;,memory_limit = 80M ; 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