X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=ae0d4ed4e17328aee231dec749a3ef22491a8221;hb=8aa3c6c50a5f3429783c7203f7bf0550f7d743a6;hp=af5cf7011e5fd51de4f888900343072021340956;hpb=2ae81168869377bdc861adb055206f41dd4c1ce4;p=myplc.git

diff --git a/plc.d/httpd b/plc.d/httpd
index af5cf70..ae0d4ed 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -57,7 +57,7 @@ case "$1" in
 	sed -i -e "s@[;]*include_path = \"\.:.*\"@include_path = \"$include_path\"@" $php_ini
 
 	# Set open_basedir so as to avoid leaks
-	open_basedir="$DocumentRoot:/etc/planetlab/php:/usr/share/plc_api/php:/var/log/myslice:/var/tmp/bootmedium:/tmp"
+	open_basedir="$DocumentRoot:/etc/planetlab/php:/usr/share/plc_api/php:/var/log/myslice:/var/tmp/bootmedium:/var/log/bm:/tmp"
 	sed -i -e "s@[;]*open_basedir =.*@open_basedir = \"$open_basedir\"@" $php_ini
 	
 	# for php-5.3 under fedora12, otherwise issues tons of warning messages
@@ -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,10 +85,10 @@ 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=
+	    # API should always be accessed via SSL
+	    if [ "$server" = "API" ] ; then
+		https_port=${!http_port}
+		http_port=
 	    fi
 
 	    # Check if we are already listening on these ports
@@ -104,16 +105,24 @@ case "$1" in
 		previous_http_port=PLC_${previous_server}_PORT
 		previous_https_port=PLC_${previous_server}_SSL_PORT
 
-		if [ "${!http_port}" = "${!previous_http_port}" ] ; then
+		if [ -z "${http_port}" ]; then
+                    skip_http=1;
+                elif [ -z "${!http_port}" ]; then
+                    skip_http=1;                    
+                elif [ "${!http_port}" = "${!previous_http_port}" ] ; then
 		    skip_http=1
 		fi
-		if [ "${!https_port}" = "${!previous_https_port}" ] ; then
+		if [ -z "${https_port}" ]; then
+                    skip_https=1
+		elif [ -z "${!https_port}" ]; then
+                    skip_https=1
+                elif [ "${!https_port}" = "${!previous_https_port}" ] ; then
 		    skip_https=1
 		fi
 	    done
 
 	    # HTTP configuration
-	    if [ $skip_http -eq 0 -a -n "${!http_port}" ] ; then
+	    if [ $skip_http -eq 0 ] ; then
 		cat <<EOF
 Listen ${!http_port}
 <VirtualHost *:${!http_port}>
@@ -122,13 +131,14 @@ 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
 
 	    # HTTPS configuration
-	    if [ $skip_https -eq 0 -a -n "${!https_port}" ] ; then
+	    if [ $skip_https -eq 0 ] ; then
 		# XXX Cannot support NameVirtualHost over SSL. If
 		# the API, boot, and web servers are all running
 		# on the same machine, the web server certificate
@@ -137,27 +147,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 /$PLC_API_PATH /usr/share/plc_api/wsgi/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
 
+   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
 
@@ -173,7 +219,7 @@ EOF
 		cat <<EOF
 # mod_wsgi location
 <Location $PLC_API_PATH>
-    Deny from all
+    $(apache_forbid)
 </Location> 
 EOF
 	    fi
@@ -246,6 +292,10 @@ EOF
 	  chmod 666 /var/log/php.log
 	fi
 
+	## make room for logs
+	touch /var/log/plcapi.log
+	chmod 666 /var/log/plcapi.log
+
 	plc_daemon httpd
 	check