X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=48d340e4f55bcea1665f21711eda866605477642;hb=b7265c4c22b97a609320b65b3f3c07d7daad03bb;hp=f21840394ca3dddc2002a05c1001c3b5a2e3d41e;hpb=77a8bd77c40473c9203735fd1f07efba4fe8268d;p=myplc.git

diff --git a/plc.d/httpd b/plc.d/httpd
index f218403..48d340e 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -57,7 +57,7 @@ case "$1" in
 	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"
+	open_basedir="$DocumentRoot:/etc/planetlab/php:/usr/share/plc_api/php:/var/log/myslice:/var/tmp/bootmedium:/var/log/bm:/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
@@ -141,14 +141,41 @@ EOF
 		    -e "s/^Listen .*/Listen ${!https_port}/" \
 		    -e "s/<VirtualHost _default_:.*>/<VirtualHost _default_:${!https_port}>/" \
 		    $ssl_conf
-	    # this is used to locate the right certificates
-	    server_lower=$(echo $server | tr 'A-Z' 'a-z')
-	    cat <<EOF
+		# this is used to locate the right certificates
+		server_lower=$(echo $server | tr 'A-Z' 'a-z')
+
+		# which one is used is currently configured in myplc.spec,
+		# with mod_python preferred
+		if rpm -q mod_python >& /dev/null ; then
+		    configure_for_mod_python=true
+		elif rpm -q mod_wsgi >& /dev/null ; then
+		    configure_for_mod_wsgi=true
+		else
+		    echo "Requires mod_python or mod_wsgi.... exiting"
+		    exit 1
+		fi
+
+		# It would be tempting to use <IfModule> here 
+		# but early tests showed this could be tricky/fragile
+		# So let's hard-wire it for one module
+		# A lot of trial-and -error was involved in getting this that way...
+
+		if [ -n "$configure_for_mod_python" ] ; then
+#################### for mod_python
+		    cat <<EOF
+# mod_python location
+<Location /PLCAPI/>
+    SetHandler mod_python
+    PythonPath "sys.path + ['/usr/share/plc_api']"
+    PythonHandler apache.ModPython
+</Location>
+EOF
 
+		elif [ -n "$configure_for_mod_wsgi" ] ; then
+#################### for mod_wsgi
+		    cat <<EOF
 # create wsgi socket where we have the permission
-<IfModule !mod_python.c>
 WSGISocketPrefix run/wsgi
-</IfModule>
 
 <VirtualHost *:${!https_port}>
 
@@ -158,17 +185,6 @@ WSGISocketPrefix run/wsgi
    SSLCertificateKeyFile /etc/planetlab/${server_lower}_ssl.key
    SSLCertificateChainFile /etc/planetlab/${server_lower}_ca_ssl.crt
 
-# we prefer mod_python if available, as first attempts at using mod_wsgi
-# turned out less reliable
-<IfModule mod_python.c>
-   <Location /$plc_api_path_noslash>
-      SetHandler mod_python
-      PythonPath "sys.path + ['/usr/share/plc_api']"
-      PythonHandler apache.ModPython
-   </Location>
-</IfModule>
-
-<IfModule !mod_python.c>
    WSGIScriptAlias /$plc_api_path_noslash /usr/share/plc_api/apache/plc.wsgi
 # xxx would be cool to be able to tweak this through config
    WSGIDaemonProcess plcapi-wsgi-ssl user=apache group=apache processes=1 threads=25
@@ -178,12 +194,10 @@ WSGISocketPrefix run/wsgi
       Options +ExecCGI
       $(apache_allow)
    </Directory>
-</IfModule>
 
 </VirtualHost>
-
 EOF
-
+		fi
 	    fi
 	done >$plc_conf