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

diff --git a/plc.d/httpd b/plc.d/httpd
index 0e517ce..25abcc3 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -1,6 +1,4 @@
 #!/bin/bash
-# $Id$
-# $URL$
 #
 # priority: 600
 #
@@ -58,6 +56,10 @@ 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
@@ -110,14 +112,12 @@ case "$1" in
 		fi
 	    done
 
-        # Create a separate path for mod_wsgi until we are ready to replace 
-        # mod_python
-        PLC_API_WSGI_PATH=/PLCAPIWSGI 
+            # 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 127.0.0.1:${!http_port}
 Listen ${!http_port}
 # create wsgi socket where we have the permission
 ### WSGISocketPrefix run/wsgi
@@ -126,11 +126,10 @@ Listen ${!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
-###     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
+    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
@@ -152,29 +151,29 @@ EOF
 	(
 	    if [ "$PLC_API_ENABLED" = "1" ] ; then
 		cat <<EOF
-# mod_python location
-<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>
-
-# 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_python location - turned off
+###<Location $PLC_API_PATH>
+###    Deny from all
+###</Location>
 
 # mod_wsgi location
-### <Location $PLC_API_WSGI_PATH/>
-###     Deny from all
-### </Location> 
+<Location $PLC_API_PATH_WSGI>
+    Deny from all
+</Location> 
 EOF
 	    fi