X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=25abcc3374c2f23bbd8e586342069e49a71bc194;hb=45447eb73cbdaa3b3b6fb8c7022b2e60f70db5e1;hp=18b459abc90617037a944db64f137e8ebfe13d47;hpb=ac4f4e2f4b7078e55a5997371ebd862326cea664;p=myplc.git

diff --git a/plc.d/httpd b/plc.d/httpd
index 18b459a..25abcc3 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -7,8 +7,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2006 The Trustees of Princeton University
 #
-# $Id$
-#
 
 # Source function library and configuration
 . /etc/plc.d/functions
@@ -58,6 +56,21 @@ case "$1" in
 	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
 
@@ -99,15 +112,24 @@ case "$1" in
 		fi
 	    done
 
+            # mod_python being retired as of fedora18 we go for mod_wsgi instead
+            PLC_API_PATH_WSGI=$PLC_API_PATH
+
 	    # 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
     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
+    WSGIScriptAlias $PLC_API_PATH_WSGI /usr/share/plc_api/ModWSGI.wsgi
+    # xxx make processes and threads configurable 
+    WSGIDaemonProcess plcapi-wsgi user=apache group=apache processes=1 threads=25
+    WSGIProcessGroup plcapi-wsgi
 </VirtualHost>
 EOF
 	    fi
@@ -129,17 +151,29 @@ EOF
 	(
 	    if [ "$PLC_API_ENABLED" = "1" ] ; then
 		cat <<EOF
-<Location $PLC_API_PATH>
-    SetHandler mod_python
-    PythonPath "sys.path + ['/usr/share/plc_api']"
-    PythonHandler ModPython
+#### mod_python location - turned off
+###<Location $PLC_API_PATH>
+###    SetHandler mod_python
+###    PythonPath "sys.path + ['/usr/share/plc_api']"
+###    PythonHandler ModPython
+###</Location>
+
+# mod_wsgi location - enabled
+<Location $PLC_API_PATH_WSGI>
+     SetHandler mod_wsgi
 </Location>
 EOF
 	    else
 		cat <<EOF
-<Location $PLC_API_PATH>
+#### mod_python location - turned off
+###<Location $PLC_API_PATH>
+###    Deny from all
+###</Location>
+
+# mod_wsgi location
+<Location $PLC_API_PATH_WSGI>
     Deny from all
-</Location>
+</Location> 
 EOF
 	    fi