Setting tag myplc-5.3-5

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index ae0d4ed..b14c76f 100755 (executable)
--- 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
@@ -44,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
@@ -59,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
@@ -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
 
@@ -108,7 +137,7 @@ case "$1" in
                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
@@ -154,14 +183,14 @@ 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"
                    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...
@@ -220,7 +249,7 @@ EOF
 # mod_wsgi location
 <Location $PLC_API_PATH>
     $(apache_forbid)
-</Location> 
+</Location>
 EOF
            fi
 
@@ -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