X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plc.d%2Fhttpd;h=101179da1c66e474cc18782f776516c70c105c11;hb=e0343cbb707f100bb22cdb1e4363b24ad8ce09da;hp=eaef6eb95d6e244bbe96cef3373d457a3d2e35cd;hpb=a1753edb3b3f85bfd57820002f63df232091e8f3;p=myplc.git

diff --git a/plc.d/httpd b/plc.d/httpd
index eaef6eb..101179d 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -65,6 +65,10 @@ case "$1" in
 	    sed -i -e 's,^;date.timezone.*,date.timezone = GMT,' $php_ini
 	fi
 
+	if grep '^short_open_tag = Off' $php_ini >& /dev/null; then
+	    sed -i -e 's,^short_open_tag = Off,short_open_tag = On,' $php_ini
+	fi
+
 	# Disable default Listen directive
 	sed -i -e '/^Listen/d' $httpd_conf
 
@@ -115,17 +119,17 @@ case "$1" in
 		cat <<EOF
 Listen ${!http_port}
 # create wsgi socket where we have the permission
-WSGISocketPrefix run/wsgi
+### WSGISocketPrefix run/wsgi
 # Make sure that the admin web pages and API are always accessed via SSL
 <VirtualHost *:${!http_port}>
     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
+###     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
+###     WSGIDaemonProcess plcapi-wsgi user=apache group=apache processes=1 threads=25
+###     WSGIProcessGroup plcapi-wsgi
 </VirtualHost>
 EOF
 	    fi
@@ -155,9 +159,9 @@ EOF
 </Location>
 
 # mod_wsgi location
-<Location $PLC_API_WSGI_PATH/>
-    SetHandler mod_wsgi
-</Location>
+### <Location $PLC_API_WSGI_PATH/>
+###     SetHandler mod_wsgi
+### </Location>
 EOF
 	    else
 		cat <<EOF
@@ -167,9 +171,9 @@ EOF
 </Location>
 
 # mod_wsgi location
-<Location $PLC_API_WSGI_PATH/>
-    Deny from all
-</Location> 
+### <Location $PLC_API_WSGI_PATH/>
+###     Deny from all
+### </Location> 
 EOF
 	    fi