X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=526e37cfda4842dc2b82d6375e6d95a2878a4dbc;hb=53c1e4601ebbbf8baaa60b61bb65fc763247235e;hp=6180e6eae012bb9be6007c0992359c899cb6c96d;hpb=aab7636f16f072802f91f20b8f2307570d290e04;p=myplc.git

diff --git a/plc.d/httpd b/plc.d/httpd
index 6180e6e..526e37c 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -46,7 +46,7 @@ case "$1" in
 
 	# set document root - not really useful on fedora but just in case
 	sed -i -e "s@^DocumentRoot.*@DocumentRoot \"$DocumentRoot\"@" $httpd_conf
-	# whether WWW is enabled or not : 
+	# whether WWW is enabled or not :
 	if [ "$PLC_WWW_ENABLED" != "1" ] ; then
 	    # avoid hitting drupal, that would try to connect to the db and create noise
 	    disable_file $DocumentRoot/index.php
@@ -61,7 +61,7 @@ case "$1" in
 	# 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:/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
 	# Set timezone in php.ini if not already there
 	if grep '^;date.timezone' $php_ini >& /dev/null; then
@@ -75,7 +75,7 @@ case "$1" in
 
 	## patch php.ini
 	# memory limit
-	sed -i -e 's,^memory_limit = 32M *;,memory_limit = 80M ; patch myplc -- ,' $php_ini 
+	sed -i -e 's,^memory_limit = 32M *;,memory_limit = 80M ; patch myplc -- ,' $php_ini
 	# log_errors : is On by default
 	# error_log
 	if ! grep '^error_log *=' $php_ini > /dev/null ; then
@@ -137,7 +137,7 @@ EOF
 		if [ -z "${http_port}" ]; then
                     skip_http=1;
                 elif [ -z "${!http_port}" ]; then
-                    skip_http=1;                    
+                    skip_http=1;
                 elif [ "${!http_port}" = "${!previous_http_port}" ] ; then
 		    skip_http=1
 		fi
@@ -183,14 +183,16 @@ EOF
 		# with mod_python preferred
 		if rpm -q mod_python >& /dev/null ; then
 		    configure_for_mod_python=true
-		elif rpm -q mod_wsgi >& /dev/null || rpm -q python2-mod_wsgi >& /dev/null ; then
+		elif rpm -q mod_wsgi >& /dev/null \
+          || rpm -q python2-mod_wsgi >& /dev/null \
+          || rpm -q python3-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 
+		# 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...
@@ -249,7 +251,7 @@ EOF
 # mod_wsgi location
 <Location $PLC_API_PATH>
     $(apache_forbid)
-</Location> 
+</Location>
 EOF
 	    fi