restart php-fpm if it gets configured

[myplc.git] / plc.d / httpd

diff --git a/plc.d/httpd b/plc.d/httpd
index e6b409d..48c8beb 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
@@ -57,7 +59,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
@@ -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
 
@@ -91,8 +120,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 +134,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 +167,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
@@ -275,16 +310,9 @@ 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
 
        plc_daemon httpd
        check