Fixed: FS#2613 - Adding chrooted cron jobs not work and freeze ispconfig jo...

tbrehm

2013-01-15 10b47ccebdb3c25faba6d1075a08c2b9fb63f827

 server/plugins-available/cron_jailkit_plugin.inc.php

@@ -215,6 +215,8 @@
   
   function _setup_jailkit_chroot()
   {
      global $app;	
			
         //check if the chroot environment is created yet if not create it with a list of program sections from the config
         if (!is_dir($this->parent_domain['document_root'].'/etc/jailkit'))
         {
@@ -239,7 +241,7 @@
            $bashrc = escapeshellcmd($this->parent_domain['document_root']).'/etc/bash.bashrc';
            if(@is_file($bashrc) || @is_link($bashrc)) unlink($bashrc);
            
            file_put_contents($bashrc,$tpl->grab());
            $app->system->file_put_contents($bashrc,$tpl->grab());
            unset($tpl);
            
            $this->app->log('Added bashrc script: '.$bashrc,LOGLEVEL_DEBUG);
@@ -252,7 +254,7 @@
            $motd = escapeshellcmd($this->parent_domain['document_root']).'/var/run/motd';
            if(@is_file($motd) || @is_link($motd)) unlink($motd);
            
            file_put_contents($motd,$tpl->grab());
            $app->system->file_put_contents($motd,$tpl->grab());
            
         }
            $this->_add_jailkit_programs();
@@ -260,6 +262,8 @@
   
   function _add_jailkit_programs()
   {
      global $app;
		
      //copy over further programs and its libraries
      $command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh';
      $command .= ' '.escapeshellcmd($this->parent_domain['document_root']);
@@ -278,6 +282,8 @@
   
   function _add_jailkit_user()
   {
         global $app;
			
         //add the user to the chroot
            $jailkit_chroot_userhome = $this->_get_home_dir($this->parent_domain['system_user']);
         
@@ -297,9 +303,9 @@
            
         $this->app->log("Added jailkit user to chroot with command: ".$command,LOGLEVEL_DEBUG);
            
         mkdir(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), 0755, true);
         chown(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_user']));
         chgrp(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_group']));
         $app->system->mkdir(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), 0755, true);
         $app->system->chown(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_user']));
         $app->system->chgrp(escapeshellcmd($this->parent_domain['document_root'].$jailkit_chroot_userhome), escapeshellcmd($this->parent_domain['system_group']));
         
   }