- Fixed FS#2702 - custom app vhost conf not taken.

ftimme

2013-02-24 c1f1611f498429d4da7d7d0f09a20f8333a9dbac

 server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -104,7 +104,7 @@
            $app->system->usermod($data['new']['username'], 0, 0, '', '/usr/sbin/jk_chrootsh', '', '');
            
            //* Unlock user
            $command = 'usermod -U '.escapeshellcmd($data['new']['username']);
            $command = 'usermod -U '.escapeshellcmd($data['new']['username']).' 2>/dev/null';
            exec($command);
            
            $this->_update_website_security_level();
@@ -212,7 +212,7 @@
            $command = '/usr/local/ispconfig/server/scripts/create_jailkit_chroot.sh';
            $command .= ' '.escapeshellcmd($this->data['new']['dir']);
            $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_sections'].'\'';
            exec($command);
            exec($command.' 2>/dev/null');
            
            $this->app->log("Added jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
            
@@ -258,7 +258,7 @@
      $command = '/usr/local/ispconfig/server/scripts/create_jailkit_programs.sh';
      $command .= ' '.escapeshellcmd($this->data['new']['dir']);
      $command .= ' \''.$this->jailkit_config['jailkit_chroot_app_programs'].'\'';
      exec($command);
      exec($command.' 2>/dev/null');
      
      $this->app->log("Added programs to jailkit chroot with command: ".$command,LOGLEVEL_DEBUG);
   }
@@ -290,7 +290,7 @@
         $command .= ' '.escapeshellcmd($this->data['new']['shell']);
         $command .= ' '.$this->data['new']['puser'];
         $command .= ' '.$jailkit_chroot_puserhome;
         exec($command);
         exec($command.' 2>/dev/null');
         
         //* Change the homedir of the shell user and parent user
         //* We have to do this manually as the usermod command fails