X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=412f6377587551bc32b255e8c37e61e9c990e1c0;hb=3c6215a60855c501e1742714257c021472a1c34a;hp=3d21644a06c13443dc26650efc52c82cc58f4bf1;hpb=b6028e4d49a8e766290096575c80298c2ae2eab5;p=myplc.git

diff --git a/plc.d/httpd b/plc.d/httpd
index 3d21644..412f637 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
 
+	plcapi_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,27 +115,19 @@ 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 
-
 	    # 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
-###     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
+# 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
 </VirtualHost>
+
 EOF
 	    fi
 
@@ -146,48 +141,52 @@ 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
+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>
+
+EOF
 	    fi
 	done >$plc_conf
 
 	# Set custom Apache directives
 	(
-	    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
-</Location>
-
-# mod_wsgi location
-### <Location $PLC_API_WSGI_PATH/>
-###     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
+# mod_wsgi location
 <Location $PLC_API_PATH>
     Deny from all
-</Location>
-
-# mod_wsgi location
-### <Location $PLC_API_WSGI_PATH/>
-###     Deny from all
-### </Location> 
+</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