X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=71d3c0e5821cd8f76d7d8418b3b0ae6cacc7b21a;hb=c0ce5478da211b11a01da1d128848e9bbc6f080f;hp=879ca7eebe9e29973fc3ad3d76b9e2675feddd04;hpb=fe5065f3018e32b93c0aa470c05d5ce340dcf754;p=myplc.git

diff --git a/plc.d/httpd b/plc.d/httpd
index 879ca7e..71d3c0e 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
@@ -84,11 +85,13 @@ case "$1" in
 	    http_port=PLC_${server}_PORT
 	    https_port=PLC_${server}_SSL_PORT
 
-#	    # API should always be accessed via SSL
-#	    if [ "$server" = "API" ] ; then
-#		https_port=${!http_port}
-#		http_port=
-#	    fi
+	    # API should always be accessed via SSL
+	    if [ "$server" = "API" ] ; then
+		https_port=${!http_port}
+		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
@@ -122,8 +125,9 @@ 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 /$PLC_API_PATH https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/$PLC_API_PATH
+   Redirect /$plc_api_path_noslash https://$PLC_WWW_HOST:$PLC_WWW_SSL_PORT/$plc_api_path_noslash
 </VirtualHost>
+
 EOF
 	    fi
 
@@ -144,8 +148,7 @@ EOF
 WSGISocketPrefix run/wsgi
 
 <VirtualHost *:${!https_port}>
-
-   WSGIScriptAlias /$PLC_API_PATH /usr/share/plc_api/wsgi/plc.wsgi
+   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
@@ -156,8 +159,14 @@ WSGISocketPrefix run/wsgi
    SSLCertificateKeyFile /etc/planetlab/${server_lower}_ssl.key
    SSLCertificateChainFile /etc/planetlab/${server_lower}_ca_ssl.crt
 
+   <Directory "/usr/share/plc_api/apache">
+   Options +ExecCGI
+   $(apache_allow)
+   </Directory>
 </VirtualHost>
+
 EOF
+
 	    fi
 	done >$plc_conf
 
@@ -173,7 +182,7 @@ EOF
 		cat <<EOF
 # mod_wsgi location
 <Location $PLC_API_PATH>
-    Deny from all
+    $(apache_forbid)
 </Location> 
 EOF
 	    fi