Fixed jailkit scripts on fedora.

Author: tbrehm

server/plugins-available/shelluser_jailkit_plugin.inc.php

@@ -188,7 +188,7 @@ function _setup_jailkit_chroot()
 				$tpl->setVar('home_dir',$this->_get_home_dir(""));
 
 				$bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc';
-				exec('rm '.$bashrc);
+				if(@is_file($bashrc)) exec('rm '.$bashrc);
 
 				file_put_contents($bashrc,$tpl->grab());
 				unset($tpl);
@@ -201,7 +201,7 @@ function _setup_jailkit_chroot()
 				$tpl->setVar('domain',$web['domain']);
 
 				$motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd';
-				exec('rm '.$motd);
+				if(@is_file($motd)) exec('rm '.$motd);
 
 				file_put_contents($motd,$tpl->grab());
 

server/scripts/create_jailkit_chroot.sh

@@ -24,12 +24,20 @@ chown root:root $CHROOT_HOMEDIR
 jk_init -f -k -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS
 
 ## Create the temp directory
-mkdir $CHROOT_HOMEDIR/tmp
+if [ ! -d "$CHROOT_HOMEDIR/tmp" ]
+then
+  mkdir $CHROOT_HOMEDIR/tmp
+fi
 chmod a+rwx $CHROOT_HOMEDIR/tmp
 
 
 # mysql needs the socket in the chrooted environment
 mkdir $CHROOT_HOMEDIR/var
 mkdir $CHROOT_HOMEDIR/var/run
 mkdir $CHROOT_HOMEDIR/var/run/mysqld
-ln /var/run/mysqld/mysqld.sock $CHROOT_HOMEDIR/var/run/mysqld/mysqld.sock
+
+# ln /var/run/mysqld/mysqld.sock $CHROOT_HOMEDIR/var/run/mysqld/mysqld.sock
+if [ -e "/var/run/mysqld/mysqld.sock" ]
+then
+  ln /var/run/mysqld/mysqld.sock $CHROOT_HOMEDIR/var/run/mysqld/mysqld.sock
+fi