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

diff --git a/plc.d/httpd b/plc.d/httpd
index ae0d4ed..6180e6e 100755
--- a/plc.d/httpd
+++ b/plc.d/httpd
@@ -21,6 +21,8 @@ php_ini=/etc/php.ini
 httpd_conf=/etc/httpd/conf/httpd.conf
 ssl_conf=/etc/httpd/conf.d/ssl.conf
 plc_conf=/etc/httpd/conf.d/plc.conf
+php_fpm_conf=/etc/php-fpm.d/plc.conf
+php_fpm_dir=$(dirname $php_fpm_conf)
 
 function disable_file () {
     file=$1; shift
@@ -71,6 +73,33 @@ case "$1" in
 	    sed -i -e 's,^short_open_tag = Off,short_open_tag = On,' $php_ini
 	fi
 
+	## patch php.ini
+	# memory limit
+	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
+	  echo 'error_log = /var/log/php.log' >> $php_ini
+	  touch /var/log/php.log
+	  chmod 666 /var/log/php.log
+	fi
+
+        # configure php-fpm as well if present (starting with f27)
+        if [ -d $php_fpm_dir ] ; then
+            cat > $php_fpm_conf << EOF
+[www]
+php_value[include_path] = $include_path
+php_value[open_basedir] = $open_basedir
+php_value[date.timezone] = GMT
+php_value[short_open_tag] = On
+php_value[memory_limit] = 80M
+EOF
+            # this is needed because otherwise, the first time
+            # we do this configuration, the service is already up
+            # and the config is usable only the second time
+            systemctl restart php-fpm
+        fi
+
 	# Disable default Listen directive
 	sed -i -e '/^Listen/d' $httpd_conf
 
@@ -154,7 +183,7 @@ 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 ; then
+		elif rpm -q mod_wsgi >& /dev/null || rpm -q python2-mod_wsgi >& /dev/null ; then
 		    configure_for_mod_wsgi=true
 		else
 		    echo "Requires mod_python or mod_wsgi.... exiting"
@@ -281,17 +310,6 @@ define('PLANETLAB_SUPPORT_EMAIL_ONLY', PLC_MAIL_SUPPORT_ADDRESS);
 ?>
 EOF
 
-	## patch php.ini
-	# memory limit
-	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
-	  echo 'error_log = /var/log/php.log' >> $php_ini
-	  touch /var/log/php.log
-	  chmod 666 /var/log/php.log
-	fi
-
 	## make room for logs
 	touch /var/log/plcapi.log
 	chmod 666 /var/log/plcapi.log