# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: httpd,v 1.3 2006/06/23 20:29:22 mlhuang Exp $
+# $Id$
#
# Source function library and configuration
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/includes:$DocumentRoot/generated:/etc/planetlab/php"
- sed -i -e "s@;include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini
+ 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
# Disable default Listen directive
sed -i -e '/^Listen/d' $httpd_conf
if [ "$server" = "$previous_server" ] ; then
break
fi
- previous_hostname=PLC_${previous_server}_HOST
+ previous_enabled=PLC_${previous_server}_ENABLED
+ if [ "${!previous_enabled}" != "1" ] ; then
+ continue
+ fi
previous_http_port=PLC_${previous_server}_PORT
previous_https_port=PLC_${previous_server}_SSL_PORT
fi
done
- # Listen on these ports
+ # HTTP configuration
if [ $skip_http -eq 0 -a -n "${!http_port}" ] ; then
cat <<EOF
Listen ${!http_port}
+# Make sure that the admin web pages and API are always accessed via SSL
<VirtualHost *:${!http_port}>
Redirect /db https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/db
- # XXX Not yet until we can get rid of oldapi
- # Redirect /$PLC_API_PATH https://$PLC_API_HOST:$PLC_API_PORT/$PLC_API_PATH
+ Redirect /planetlab https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/planetlab
+ Redirect /$PLC_API_PATH https://$PLC_API_HOST:$PLC_API_PORT/$PLC_API_PATH
</VirtualHost>
EOF
fi
+
+ # HTTPS configuration
if [ $skip_https -eq 0 -a -n "${!https_port}" ] ; then
# XXX Cannot support NameVirtualHost over SSL. If
# the API, boot, and web servers are all running
if [ "$PLC_API_ENABLED" = "1" ] ; then
cat <<EOF
<Location $PLC_API_PATH>
- SetHandler python-program
+ SetHandler mod_python
PythonPath "sys.path + ['/usr/share/plc_api']"
- PythonHandler mod_pythonXMLRPC
+ PythonHandler ModPython
</Location>
EOF
else
if [ "$PLC_WWW_ENABLED" != "1" ] ; then
cat <<EOF
-<Location /db>
- Deny from all
-</Location>
+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
chown apache:apache $DocumentRoot/alpina-logs/nodes
+ # Make the Drupal files upload directory owned by Apache
+ mkdir -p $DocumentRoot/files
+ chown apache:apache $DocumentRoot/files
+
+ # Symlink any (real) files or directories in
+ # /data/var/www/html/* to /var/www/html/. We could descend
+ # into subdirectories, but the code to do so properly would be
+ # madness.
+ for file in /data/$DocumentRoot/* ; do
+ if [ -e "$file" -a ! -h "$file" ] ; then
+ base=$(basename "$file")
+ if [ ! -e "$DocumentRoot/$base" ] ; then
+ ln -nsf "$file" "$DocumentRoot/$base"
+ fi
+ fi
+ done
+
+ # Cleanup broken symlinks
+ for file in $DocumentRoot/* ; do
+ if [ -h "$file" -a ! -e "$file" ] ; then
+ rm -f "$file"
+ fi
+ done
+
# Old style PHP constants
mkdir -p /etc/planetlab/php
cat >/etc/planetlab/php/site_constants.php <<"EOF"
?>
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