Skip to content
Snippets Groups Projects
Commit 42b3854f authored by tbrehm's avatar tbrehm
Browse files

Fixed jailkit scripts on fedora.

parent 130cd42c
No related branches found
No related tags found
No related merge requests found
...@@ -188,7 +188,7 @@ class shelluser_jailkit_plugin { ...@@ -188,7 +188,7 @@ class shelluser_jailkit_plugin {
$tpl->setVar('home_dir',$this->_get_home_dir("")); $tpl->setVar('home_dir',$this->_get_home_dir(""));
$bashrc = escapeshellcmd($this->data['new']['dir']).'/etc/bash.bashrc'; $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()); file_put_contents($bashrc,$tpl->grab());
unset($tpl); unset($tpl);
...@@ -201,7 +201,7 @@ class shelluser_jailkit_plugin { ...@@ -201,7 +201,7 @@ class shelluser_jailkit_plugin {
$tpl->setVar('domain',$web['domain']); $tpl->setVar('domain',$web['domain']);
$motd = escapeshellcmd($this->data['new']['dir']).'/var/run/motd'; $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()); file_put_contents($motd,$tpl->grab());
......
...@@ -24,7 +24,10 @@ chown root:root $CHROOT_HOMEDIR ...@@ -24,7 +24,10 @@ chown root:root $CHROOT_HOMEDIR
jk_init -f -k -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS jk_init -f -k -j $CHROOT_HOMEDIR $CHROOT_APP_SECTIONS
## Create the temp directory ## 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 chmod a+rwx $CHROOT_HOMEDIR/tmp
...@@ -32,4 +35,9 @@ chmod a+rwx $CHROOT_HOMEDIR/tmp ...@@ -32,4 +35,9 @@ chmod a+rwx $CHROOT_HOMEDIR/tmp
mkdir $CHROOT_HOMEDIR/var mkdir $CHROOT_HOMEDIR/var
mkdir $CHROOT_HOMEDIR/var/run mkdir $CHROOT_HOMEDIR/var/run
mkdir $CHROOT_HOMEDIR/var/run/mysqld 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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment