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

diff --git a/plc.d/httpd b/plc.d/httpd
index 71d3c0e..f218403 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -144,14 +144,13 @@ EOF
 	    # this is used to locate the right certificates
 	    server_lower=$(echo $server | tr 'A-Z' 'a-z')
 	    cat <<EOF
+
 # create wsgi socket where we have the permission
+<IfModule !mod_python.c>
 WSGISocketPrefix run/wsgi
+</IfModule>
 
 <VirtualHost *:${!https_port}>
-   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
-   WSGIProcessGroup plcapi-wsgi-ssl
 
    # SSL
    SSLEngine On
@@ -159,10 +158,28 @@ 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
+   WSGIProcessGroup plcapi-wsgi-ssl
+
    <Directory "/usr/share/plc_api/apache">
-   Options +ExecCGI
-   $(apache_allow)
+      Options +ExecCGI
+      $(apache_allow)
    </Directory>
+</IfModule>
+
 </VirtualHost>
 
 EOF