# 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
# 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
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:/etc/planetlab/php:/usr/share/plc_api/php"
sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini
# Disable default Listen directive
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
?>
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