fix for fedora12

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index 6f10515..64999cc 100755 (executable)
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -7,7 +7,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id: httpd,v 1.7 2006/10/30 22:38:22 mlhuang Exp $
+# $Id$
 #
 
 # Source function library and configuration
@@ -24,6 +24,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 +44,27 @@ 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:$DocumentRoot/generated:/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
 
+       # 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
+
        # Disable default Listen directive
        sed -i -e '/^Listen/d' $httpd_conf
 
@@ -65,7 +91,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 +106,20 @@ case "$1" in
                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
@@ -119,11 +152,13 @@ EOF
 
            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
@@ -133,6 +168,26 @@ EOF
        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"
@@ -155,6 +210,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