Merge branch 'update_jailkit' into 'develop'

jailkit update MR feedback

See merge request ispconfig/ispconfig3!1185

Author: Till Brehm

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

@@ -53,15 +53,7 @@ public function onBeforeRun() {
 	public function onRunJob() {
 		global $app, $conf;
 
-		$app->uses('system,getconf');
-
 		$server_config = $app->getconf->get_server_config($conf['server_id'], 'server');
-		if(isset($server_config['migration_mode']) && $server_config['migration_mode'] == 'y') {
-			//$app->log('Migration mode active, not running Jailkit updates.', LOGLEVEL_DEBUG);
-			print "Migration mode active, not running Jailkit updates.\n";
-
-			return;
-		}
 
 		$jailkit_config = $app->getconf->get_server_config($conf['server_id'], 'jailkit');
 		if (isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {
@@ -77,7 +69,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, php_fpm_chroot, jailkit_chroot_app_sections, jailkit_chroot_app_programs, delete_unused_jailkit, last_jailkit_hash 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, last_jailkit_hash FROM web_domain WHERE type = 'vhost' AND (last_jailkit_update IS NULL OR 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) {

server/plugins-available/apache2_plugin.inc.php

@@ -3713,12 +3713,12 @@ function _setup_jailkit_chroot()
 
 		if (isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {
 			if ($this->jailkit_config['jailkit_hardlinks'] == 'yes') {
-				$options = array( 'hardlink');
+				$options = array('hardlink');
 			} elseif ($this->jailkit_config['jailkit_hardlinks'] == 'no') {
 				$options = array();
 			}
 		} else {
-			$options = array( 'allow_hardlink');
+			$options = array('allow_hardlink');
 		}
 
 		// should move return here if $this->website['new_jailkit_hash'] == $this->website['last_jailkit_hash'] ?

server/plugins-available/nginx_plugin.inc.php

@@ -3485,12 +3485,12 @@ function _setup_jailkit_chroot()
 
 		if (isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {
 			if ($this->jailkit_config['jailkit_hardlinks'] == 'yes') {
-				$options = array( 'hardlink');
+				$options = array('hardlink');
 			} elseif ($this->jailkit_config['jailkit_hardlinks'] == 'no') {
 				$options = array();
 			}
 		} else {
-			$options = array( 'allow_hardlink');
+			$options = array('allow_hardlink');
 		}
 
 		// should move return here if $this->website['new_jailkit_hash'] == $this->website['last_jailkit_hash'] ?