#!/bin/bash
#
-# priority: 700
+# priority: 600
#
# Configure Apache web server
#
# 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 $
-#
# Source function library and configuration
. /etc/plc.d/functions
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 \
MESSAGE=$"Starting web server"
dialog "$MESSAGE"
+ # 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
+ # avoid hitting drupal, that would try to connect to the db and create noise
+ disable_file $DocumentRoot/index.php
+ else
+ enable_file $DocumentRoot/index.php
+ 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/plekit/php:$DocumentRoot/generated:/etc/planetlab/php:/usr/share/plc_api/php"
+ sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini
+
+ # Set open_basedir so as to avoid leaks
+ open_basedir="$DocumentRoot:/etc/planetlab/php:/usr/share/plc_api/php:/var/log/myslice:/var/tmp/bootmedium:/tmp"
+ sed -i -e "s@[;]*open_basedir =.*@open_basedir = \"$open_basedir\"@" $php_ini
+
+ # for php-5.3 under fedora12, otherwise issues tons of warning messages
+ # Set timezone in php.ini if not already there
+ if grep '^;date.timezone' $php_ini >& /dev/null; then
+ dialog 'Setting PHP timezone to GMT'
+ sed -i -e 's,^;date.timezone.*,date.timezone = GMT,' $php_ini
+ fi
+
+ if grep '^short_open_tag = Off' $php_ini >& /dev/null; then
+ sed -i -e 's,^short_open_tag = Off,short_open_tag = On,' $php_ini
+ fi
# 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
+ # Create a separate path for mod_wsgi until we are ready to replace
+ # mod_python
+ PLC_API_WSGI_PATH=/PLCAPIWSGI
+
+ # HTTP configuration
if [ $skip_http -eq 0 -a -n "${!http_port}" ] ; then
cat <<EOF
Listen ${!http_port}
+# create wsgi socket where we have the permission
+### WSGISocketPrefix run/wsgi
+# 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
+### Redirect /$PLC_API_WSGI_PATH/ https://$PLC_API_HOST:$PLC_API_PORT/$PLC_API_WSGI_PATH/
+### WSGIScriptAlias $PLC_API_WSGI_PATH /usr/share/plc_api/ModWSGI.wsgi
+ # XX make processes and threads configurable
+### WSGIDaemonProcess plcapi-wsgi user=apache group=apache processes=1 threads=25
+### WSGIProcessGroup plcapi-wsgi
</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
+# mod_python location
<Location $PLC_API_PATH>
- SetHandler python-program
+ SetHandler mod_python
PythonPath "sys.path + ['/usr/share/plc_api']"
- PythonHandler mod_pythonXMLRPC
+ PythonHandler ModPython
</Location>
+
+# mod_wsgi location
+### <Location $PLC_API_WSGI_PATH/>
+### SetHandler mod_wsgi
+### </Location>
EOF
else
cat <<EOF
+# mod_python location
<Location $PLC_API_PATH>
Deny from all
</Location>
+
+# mod_wsgi location
+### <Location $PLC_API_WSGI_PATH/>
+### Deny from all
+### </Location>
EOF
fi
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 = 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
git://git.onelab.eu / myplc.git / blobdiff