X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=3d21644a06c13443dc26650efc52c82cc58f4bf1;hb=b6028e4d49a8e766290096575c80298c2ae2eab5;hp=6d985efffee0d1ec0eec29f2dea75a0b1aefe1da;hpb=392955e7388889dc644569d06dbed5558cb1d530;p=myplc.git diff --git a/plc.d/httpd b/plc.d/httpd index 6d985ef..3d21644 100755 --- a/plc.d/httpd +++ b/plc.d/httpd @@ -1,14 +1,12 @@ #!/bin/bash # -# priority: 700 +# priority: 600 # # Configure Apache web server # # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: httpd,v 1.5 2006/10/27 20:29:04 mlhuang Exp $ -# # Source function library and configuration . /etc/plc.d/functions @@ -24,6 +22,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,10 +42,35 @@ case "$1" in 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/planetlab/includes:/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 + # 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 @@ -65,7 +97,10 @@ case "$1" in 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 @@ -77,16 +112,31 @@ case "$1" in 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 < 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 +### 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 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 @@ -103,35 +153,70 @@ EOF ( if [ "$PLC_API_ENABLED" = "1" ] ; then cat < SetHandler mod_python PythonPath "sys.path + ['/usr/share/plc_api']" PythonHandler ModPython + +# mod_wsgi location +### +### SetHandler mod_wsgi +### EOF else cat < Deny from all + +# mod_wsgi location +### +### Deny from all +### EOF fi if [ "$PLC_WWW_ENABLED" != "1" ] ; then cat < - Deny from all - +Redirect /index.html http://$PLC_WWW_HOST:$PLC_WWW_PORT/ EOF fi + cat <>$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" @@ -154,6 +239,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