Merge remote-tracking branch 'helmo/6501-php-ssh-cron' into 6501-php-ssh-cron

Author: ms217

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

@@ -42,12 +42,12 @@ public function onRunJob() {
 		$jailkit_config = $app->getconf->get_server_config($conf['server_id'], 'jailkit');
 		if (isset($this->jailkit_config) && isset($this->jailkit_config['jailkit_hardlinks'])) {
 			if ($this->jailkit_config['jailkit_hardlinks'] == 'yes') {
-				$options = array('hardlink');
+				$global_options = array('hardlink');
 			} elseif ($this->jailkit_config['jailkit_hardlinks'] == 'no') {
-				$options = array();
+				$global_options = array();
 			}
 		} else {
-			$options = array('allow_hardlink');
+			$global_options = array('allow_hardlink');
 		}
 
 		// force all jails to update every 2 weeks
@@ -65,7 +65,12 @@ 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, system_user, system_group, 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 ?";
+		$sql = "SELECT domain_id, domain, document_root, system_user, system_group, php_fpm_chroot, jailkit_chroot_app_sections, jailkit_chroot_app_programs, delete_unused_jailkit, last_jailkit_hash, `php_cli_binary`
+					FROM web_domain
+						LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
+					WHERE type = 'vhost' AND (last_jailkit_update IS NULL OR last_jailkit_update < (NOW() - INTERVAL 24 HOUR)) AND web_domain.server_id = ? and domain_id=57
+					ORDER by last_jailkit_update
+					LIMIT ?";
 		$records = $app->db->queryAllRecords($sql, $conf['server_id'], $num_jails_to_update);
 
 		foreach($records as $rec) {
@@ -74,6 +79,9 @@ public function onRunJob() {
 				continue;
 			}
 
+			$options = $global_options;
+			$options['php_cli_binary'] = $rec['php_cli_binary'];
+
 			//$app->log('Beginning jailkit maintenance for domain '.$rec['domain'].' at '.$rec['document_root'], LOGLEVEL_DEBUG);
 			print 'Beginning jailkit maintenance for domain '.$rec['domain'].' at '.$rec['document_root']."\n";
 

server/lib/classes/system.inc.php

@@ -2829,11 +2829,27 @@ public function update_jailkit_chroot($home_dir, $sections = array(), $programs
 			$this->chmod($home_dir . '/var/tmp', 0770, true);
 		}
 
-		// TODO: Set /usr/bin/php symlink to php version of the website.
-		//
-		// Currently server_php does not have a field for the cli path;
-		// we can guess/determing according to OS-specific conventions or add that field.
-		// Then symlink /usr/bin/php (or correct OS-specific path) to that location.
+		if (!empty($options['php_cli_binary'])) {
+			if(!file_exists($home_dir . '/' . $options['php_cli_binary'])) {
+				$app->log("The PHP cli binary " . $options['php_cli_binary'] . " is not available in the jail of the web " . $this->web['domain']  . " / SSH/SFTP user: " . $this->username  . ". Check your Jailkit setup!", LOGLEVEL_DEBUG);
+				$tpl->setVar('use_php_path', false);
+				$tpl->setVar('use_php_alias', false);
+				if(is_link($home_dir . '/etc/alternatives/php'))
+				{
+					unlink($home_dir . '/etc/alternatives/php');
+				}
+			} else {
+				if($app->system->get_os_type() == "debian" || $app->system->get_os_type() == "ubuntu") {
+					$app->log("update_jailkit_chroot: setting alternatives/php to " . $options['php_cli_binary'], LOGLEVEL_DEBUG);
+					if(is_link($home_dir . '/etc/alternatives/php') || is_file($home_dir . '/etc/alternatives/php'))
+					{
+						unlink($home_dir . '/etc/alternatives/php');
+					}
+					symlink($options['php_cli_binary'], $home_dir . '/etc/alternatives/php');
+				}
+
+			}
+		}
 
 		// search for any hardlinked files which are now missing
 		if (!(in_array('hardlink', $opts) || in_array('allow_hardlink', $options))) {

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -344,7 +344,10 @@ function _setup_jailkit_chroot()
 			$options = array('allow_hardlink');
 		}
 
-		$web = $app->db->queryOneRecord("SELECT domain, last_jailkit_hash FROM web_domain WHERE domain_id = ?", $this->data['new']["parent_domain_id"]);
+		$web = $app->db->queryOneRecord("SELECT `domain`, `last_jailkit_hash`, `php_cli_binary` FROM web_domain
+			LEFT JOIN server_php ON web_domain.server_php_id = server_php.server_php_id
+			WHERE `domain_id` = ?", $data["new"]["parent_domain_id"]);
+
 
 		$last_updated = preg_split('/[\s,]+/', $this->jailkit_config['jailkit_chroot_app_sections']
 						  .' '.$this->jailkit_config['jailkit_chroot_app_programs']
@@ -389,6 +392,7 @@ function _setup_jailkit_chroot()
 			foreach ($records as $record) {
 				$options[] = 'skip='.$record['web_folder'];
 			}
+			$options['php_cli_binary'] = $web['php_cli_binary'];
 
 			$app->system->update_jailkit_chroot($this->data['new']['dir'], $sections, $programs, $options);
 
@@ -725,21 +729,6 @@ function _setup_php_jailkit() {
 				$app->log("The PHP cli binary " . $this->web['php_cli_binary'] . " is not available in the jail of the web " . $this->web['domain']  . " / SSH/SFTP user: " . $this->username  . ". Check your Jailkit setup!", LOGLEVEL_DEBUG);
 				$tpl->setVar('use_php_path', false);
 				$tpl->setVar('use_php_alias', false);
-				if(is_link($this->web['document_root'] . '/etc/alternatives/php'))
-				{
-					unlink($this->web['document_root'] . '/etc/alternatives/php');
-				}
-			} else {
-				if($app->system->get_os_type() == "debian" || $app->system->get_os_type() == "ubuntu") {
-					if(is_link($this->web['document_root'] . '/etc/alternatives/php') || is_file($this->web['document_root'] . '/etc/alternatives/php'))
-					{
-						unlink($this->web['document_root'] . '/etc/alternatives/php');
-						symlink($this->web['php_cli_binary'], $this->web['document_root'] . '/etc/alternatives/php');
-					} else {
-						symlink($this->web['php_cli_binary'], $this->web['document_root'] . '/etc/alternatives/php');
-					}
-				}
-
 			}
 		}