Fixed #1106: Defect - PHP5-FPM server implementation - Reload failure…

… under Ubuntu Trusty Thar

Cleanup

CHANGELOG

@@ -51,6 +51,7 @@ TICKETS
 	Fixed #1095: Bug - IP usage interface is broken
 	Fixed #1097: Enhancement - Allow to set public IP for server which are inside a private LAN
 	Fixed #1099: Bug - SQL users which belong to an account which is being deleted are not removed from mysql table
+	Fixed #1106: Defect - PHP5-FPM server implementation - Reload failure under Ubuntu Trusty Thar
 
 ------------------------------------------------------------------------------------------------------------------------
 1.1.11

configs/debian/php-fpm/install.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <install>
-    <folders>${ROOT_CONF}/init.d</folders>
     <folders>${SYSTEM_CONF}/php-fpm</folders>
     <folders>${SYSTEM_CONF}/php-fpm/backup</folders>
     <folders>${SYSTEM_CONF}/php-fpm/working</folders>

configs/ubuntu/php-fpm/install.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<install>
+    <folders>${ROOT_CONF}/init</folders>
+    <folders>${SYSTEM_CONF}/php-fpm</folders>
+    <folders>${SYSTEM_CONF}/php-fpm/backup</folders>
+    <folders>${SYSTEM_CONF}/php-fpm/working</folders>
+    <copy_config>${SYSTEM_CONF}/php-fpm/parts</copy_config>
+    <copy_config mode="0644" user="${ROOT_USER}" group="${ROOT_GROUP}">${ROOT_CONF}/init/php5-fpm.override</copy_config>
+    <copy_config>${SYSTEM_CONF}/php-fpm/logrotate.conf</copy_config>
+    <copy_config>${SYSTEM_CONF}/php-fpm/php-fpm.conf</copy_config>
+    <copy_config>${SYSTEM_CONF}/php-fpm/php_fpm_imscp.conf</copy_config>
+    <copy_config>${SYSTEM_CONF}/php-fpm/php_fpm_imscp.load</copy_config>
+    <copy_config>${SYSTEM_CONF}/php-fpm/phpfpm.data</copy_config>
+</install>

configs/ubuntu/php-fpm/php5-fpm.override

@@ -0,0 +1,3 @@
+# File added by i-MSCP internet - Multi Server Control Panel
+# Fix for issue #1106 (only processed by Upstart >= v1.7)
+reload signal USR2

engine/PerlLib/Servers/httpd/apache_php_fpm/uninstaller.pm

@@ -269,6 +269,10 @@ sub _restorePhpfpmConfig
 		"$self->{'phpfpmConfig'}->{'PHP_FPM_POOLS_CONF_DIR'}/www.conf"
 	) if -f "$self->{'phpfpmConfig'}->{'PHP_FPM_POOLS_CONF_DIR'}/www.conf.disabled";
 
+	$rs = iMSCP::File->new(
+		'filename' => "/etc/init/php5-fpm.override"
+	)->delFile() if -f "/etc/init/php5-fpm.override";
+
 	$rs;
 }