bump major to 5.2

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index 412f637..e6b409d 100755 (executable)
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -74,7 +74,7 @@ case "$1" in
        # Disable default Listen directive
        sed -i -e '/^Listen/d' $httpd_conf
 
-       plcapi_noslash=$(echo $PLC_API_PATH | sed -e s,/,,g)
+       plc_api_path_noslash=$(echo $PLC_API_PATH | sed -e s,/,,g)
        # Set the port numbers
        for server in WWW API BOOT ; do
            enabled=PLC_${server}_ENABLED
@@ -125,7 +125,7 @@ Listen ${!http_port}
     Redirect /planetlab https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/planetlab
 # as a matter of fact most xmlrpc clients won't follow the redirection
 # so this is mostly rethorical, but just in case...
-   Redirect /$plcapi_noslash https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/$plcapi_noslash
+   Redirect /$plc_api_path_noslash https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/$plc_api_path_noslash
 </VirtualHost>
 
 EOF
@@ -141,26 +141,63 @@ 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
 WSGISocketPrefix run/wsgi
 
 <VirtualHost *:${!https_port}>
-   WSGIScriptAlias /$plcapi_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
    SSLCertificateFile /etc/planetlab/${server_lower}_ssl.crt
    SSLCertificateKeyFile /etc/planetlab/${server_lower}_ssl.key
    SSLCertificateChainFile /etc/planetlab/${server_lower}_ca_ssl.crt
-</VirtualHost>
 
+   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)
+   </Directory>
+
+</VirtualHost>
 EOF
+               fi
            fi
        done >$plc_conf
 
@@ -176,7 +213,7 @@ EOF
                cat <<EOF
 # mod_wsgi location
 <Location $PLC_API_PATH>
-    Deny from all
+    $(apache_forbid)
 </Location> 
 EOF
            fi