don't delete jail if used by php-fpm

Author: jnorell

server/lib/classes/cron.d/600-jailkit_maintenance.inc.php

@@ -75,7 +75,7 @@ public function onRunJob() {
 		// limit the number of jails we update at one time according to time of day
 		$num_jails_to_update = (date('H') < 6) ? 25 : 3;
 
-		$sql = "SELECT domain_id, domain, document_root, jailkit_chroot_app_sections, jailkit_chroot_app_programs, delete_unused_jailkit FROM web_domain WHERE type = 'vhost' AND last_jailkit_update < (NOW() - INTERVAL 24 HOUR) AND server_id = ? ORDER by last_jailkit_update LIMIT ?";
+		$sql = "SELECT domain_id, domain, document_root, php_fpm_chroot, jailkit_chroot_app_sections, jailkit_chroot_app_programs, delete_unused_jailkit FROM web_domain WHERE type = 'vhost' AND last_jailkit_update < (NOW() - INTERVAL 24 HOUR) AND server_id = ? ORDER by last_jailkit_update LIMIT ?";
 		$records = $app->db->queryAllRecords($sql, $conf['server_id'], $num_jails_to_update);
 
 		foreach($records as $rec) {
@@ -92,7 +92,7 @@ public function onRunJob() {
 			// check for any cron job using this jail
 			$cron_inuse = $app->db->queryOneRecord('SELECT id FROM `cron` WHERE `parent_domain_id` = ? AND `type` = ? AND `server_id` = ?', $rec['domain_id'], 'chrooted', $conf['server_id']);
 
-			if ($shell_user_inuse || $cron_inuse || $rec['delete_unused_jailkit'] != 'y') {
+			if ($shell_user_inuse || $cron_inuse || $rec['php_fpm_chroot'] == 'y' || $rec['delete_unused_jailkit'] != 'y') {
 				$sections = $jailkit_config['jailkit_chroot_app_sections'];
 				if (isset($web['jailkit_chroot_app_sections']) && $web['jailkit_chroot_app_sections'] != '') {
 					$sections = $web['jailkit_chroot_app_sections'];
@@ -102,12 +102,10 @@ public function onRunJob() {
 					$programs = $web['jailkit_chroot_app_programs'];
 				}
 				$app->system->update_jailkit_chroot($rec['document_root'], $sections, $programs, $update_options);
-			} else {
-				if ($rec['delete_unused_jailkit'] == 'y') {
-					//$app->log('Removing unused jail: '.$rec['document_root'], LOGLEVEL_DEBUG);
-					print 'Removing unused jail: '.$rec['document_root']."\n";
-					$app->system->delete_jailkit_chroot($rec['document_root']);
-				}
+			} elseif ($rec['delete_unused_jailkit'] == 'y') {
+				//$app->log('Removing unused jail: '.$rec['document_root'], LOGLEVEL_DEBUG);
+				print 'Removing unused jail: '.$rec['document_root']."\n";
+				$app->system->delete_jailkit_chroot($rec['document_root']);
 			}
 
 			// might need to update master db here?  checking....

server/plugins-available/cron_jailkit_plugin.inc.php

@@ -362,6 +362,11 @@ private function _delete_jailkit_if_unused($parent_domain_id) {
 			return;
 		}
 
+		// chroot is used by php-fpm
+		if (isset($parent_domain['php_fpm_chroot']) && $parent_domain['php_fpm_chroot'] == 'y') {
+			return;
+		}
+
 		// check for any shell_user using this jail
 		$inuse = $app->db->queryOneRecord('SELECT shell_user_id FROM `shell_user` WHERE `parent_domain_id` = ? AND `chroot` = ?', $parent_domain_id, 'jailkit');
 		if($inuse) {

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -594,6 +594,11 @@ private function _delete_jailkit_if_unused($parent_domain_id) {
 			return;
 		}
 
+		// chroot is used by php-fpm
+		if (isset($parent_domain['php_fpm_chroot']) && $parent_domain['php_fpm_chroot'] == 'y') {
+			return;
+		}
+
 		// check for any shell_user using this jail
 		$inuse = $app->db->queryOneRecord('SELECT shell_user_id FROM `shell_user` WHERE `parent_domain_id` = ? AND `chroot` = ?', $parent_domain_id, 'jailkit');
 		if($inuse) {