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

diff --git a/plc.d/httpd b/plc.d/httpd
index 25abcc3..f218403 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -74,6 +74,7 @@ case "$1" in
 	# Disable default Listen directive
 	sed -i -e '/^Listen/d' $httpd_conf
 
+	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
@@ -90,6 +91,8 @@ case "$1" in
 		http_port=
 	    fi
 
+	    echo "# DBG server=$server hostname=${!hostname} http_port=${!http_port} https_port=${!https_port}"
+
 	    # Check if we are already listening on these ports
 	    skip_http=0
 	    skip_https=0
@@ -112,25 +115,19 @@ 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}>
+    # Make sure that the admin web pages are always accessed via SSL
     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
+# as a matter of fact most xmlrpc clients won't follow the redirection
+# so this is mostly rethorical, but just in case...
+   Redirect /$plc_api_path_noslash https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/$plc_api_path_noslash
 </VirtualHost>
+
 EOF
 	    fi
 
@@ -144,48 +141,75 @@ 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
+
+# create wsgi socket where we have the permission
+<IfModule !mod_python.c>
+WSGISocketPrefix run/wsgi
+</IfModule>
+
+<VirtualHost *:${!https_port}>
+
+   # 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
+
+# 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)
+   </Directory>
+</IfModule>
+
+</VirtualHost>
+
+EOF
+
 	    fi
 	done >$plc_conf
 
 	# Set custom Apache directives
 	(
-	    if [ "$PLC_API_ENABLED" = "1" ] ; then
-		cat <<EOF
-#### 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>
+	    # could be restricted to boot boxes but harmless..
+	    cat <<EOF
+AddType application/octet-stream .iso
+AddType application/octet-stream .usb
 EOF
-	    else
+	    # make sure /PLCAPI can't get accessed if API not enabled here
+	    if [ "$PLC_API_ENABLED" != "1" ] ; then
 		cat <<EOF
-#### 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 $PLC_API_PATH>
+    $(apache_forbid)
 </Location> 
 EOF
 	    fi
 
+	    # redirect www requests if not on the right server
 	    if [ "$PLC_WWW_ENABLED" != "1" ] ; then
 		cat <<EOF
 Redirect /index.html http://$PLC_WWW_HOST:$PLC_WWW_PORT/
 EOF
 	    fi
-	    cat <<EOF
-AddType application/octet-stream .iso
-AddType application/octet-stream .usb
-EOF
 	) >>$plc_conf
 
 	# Make alpina-logs directory writable for bootmanager log upload