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

diff --git a/plc.d/httpd b/plc.d/httpd
index 71d3c0e..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
@@ -91,8 +91,6 @@ 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
@@ -107,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}>
@@ -132,7 +138,7 @@ 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
@@ -141,17 +147,43 @@ 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_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
@@ -159,14 +191,19 @@ WSGISocketPrefix run/wsgi
    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)
+      Options +ExecCGI
+      $(apache_allow)
    </Directory>
-</VirtualHost>
 
+</VirtualHost>
 EOF
-
+		fi
 	    fi
 	done >$plc_conf
 
@@ -255,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