From 42b3854f7ca1d2877d717d8cb8cbb2d5b1a9a3cc Mon Sep 17 00:00:00 2001 From: tbrehm Date: Wed, 4 Mar 2009 18:06:19 +0000 Subject: [PATCH] Fixed jailkit scripts on fedora. --- .../shelluser_jailkit_plugin.inc.php | 4 ++-- server/scripts/create_jailkit_chroot.sh | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/server/plugins-available/shelluser_jailkit_plugin.inc.php b/server/plugins-available/shelluser_jailkit_plugin.inc.php index efbe78784..308178ff8 100755 --- a/server/plugins-available/shelluser_jailkit_plugin.inc.php +++ b/server/plugins-available/shelluser_jailkit_plugin.inc.php @@ -188,7 +188,7 @@ class shelluser_jailkit_plugin { $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 @@ class shelluser_jailkit_plugin { $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()); diff --git a/server/scripts/create_jailkit_chroot.sh b/server/scripts/create_jailkit_chroot.sh index 07460df95..312148db5 100755 --- a/server/scripts/create_jailkit_chroot.sh +++ b/server/scripts/create_jailkit_chroot.sh @@ -24,7 +24,10 @@ 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 @@ -32,4 +35,9 @@ chmod a+rwx $CHROOT_HOMEDIR/tmp 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 -- GitLab