# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: httpd,v 1.8 2007/01/25 20:27:18 mlhuang Exp $
+# $Id: httpd,v 1.11 2007/02/06 16:24:13 mlhuang Exp $
#
# 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/planetlab/includes:$DocumentRoot/generated:/etc/planetlab/php:/usr/share/plc_api/php"
sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini
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
+ 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_WWW_ENABLED" != "1" ] ; then
cat <<EOF
-<Location /db>
- Deny from all
-</Location>
+Redirect /index.html http://$PLC_WWW_HOST:$PLC_WWW_PORT/
EOF
fi
) >>$plc_conf