Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
lolo888
ISPConfig 3
Commits
94d2cf4c
Commit
94d2cf4c
authored
Sep 14, 2012
by
Falko Timme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
- Make sure ISPConfig doesn't overwrite the system's motd file when creating a chrooted cron job.
parent
aea33775
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
server/plugins-available/cron_jailkit_plugin.inc.php
server/plugins-available/cron_jailkit_plugin.inc.php
+2
-2
server/plugins-available/shelluser_jailkit_plugin.inc.php
server/plugins-available/shelluser_jailkit_plugin.inc.php
+3
-3
No files found.
server/plugins-available/cron_jailkit_plugin.inc.php
View file @
94d2cf4c
...
...
@@ -236,7 +236,7 @@ class cron_jailkit_plugin {
$tpl
->
setVar
(
'home_dir'
,
$this
->
_get_home_dir
(
""
));
$bashrc
=
escapeshellcmd
(
$this
->
parent_domain
[
'document_root'
])
.
'/etc/bash.bashrc'
;
if
(
@
is_file
(
$bashrc
))
unlink
(
$bashrc
);
if
(
@
is_file
(
$bashrc
)
||
@
is_link
(
$bashrc
)
)
unlink
(
$bashrc
);
file_put_contents
(
$bashrc
,
$tpl
->
grab
());
unset
(
$tpl
);
...
...
@@ -249,7 +249,7 @@ class cron_jailkit_plugin {
$tpl
->
setVar
(
'domain'
,
$this
->
parent_domain
[
'domain'
]);
$motd
=
escapeshellcmd
(
$this
->
parent_domain
[
'document_root'
])
.
'/var/run/motd'
;
if
(
@
is_file
(
$motd
))
unlink
(
$motd
);
if
(
@
is_file
(
$motd
)
||
@
is_link
(
$motd
)
)
unlink
(
$motd
);
file_put_contents
(
$motd
,
$tpl
->
grab
());
...
...
server/plugins-available/shelluser_jailkit_plugin.inc.php
View file @
94d2cf4c
...
...
@@ -227,12 +227,12 @@ class shelluser_jailkit_plugin {
$tpl
->
setVar
(
'home_dir'
,
$this
->
_get_home_dir
(
""
));
$bashrc
=
escapeshellcmd
(
$this
->
data
[
'new'
][
'dir'
])
.
'/etc/bash.bashrc'
;
if
(
@
is_file
(
$bashrc
))
unlink
(
$bashrc
);
if
(
@
is_file
(
$bashrc
)
||
@
is_link
(
$bashrc
)
)
unlink
(
$bashrc
);
file_put_contents
(
$bashrc
,
$tpl
->
grab
());
unset
(
$tpl
);
$this
->
app
->
log
(
"Added bashrc scrpt : "
.
$bashrc
,
LOGLEVEL_DEBUG
);
$this
->
app
->
log
(
"Added bashrc scr
i
pt : "
.
$bashrc
,
LOGLEVEL_DEBUG
);
$tpl
=
new
tpl
();
$tpl
->
newTemplate
(
"motd.master"
);
...
...
@@ -240,7 +240,7 @@ class shelluser_jailkit_plugin {
$tpl
->
setVar
(
'domain'
,
$web
[
'domain'
]);
$motd
=
escapeshellcmd
(
$this
->
data
[
'new'
][
'dir'
])
.
'/var/run/motd'
;
if
(
@
is_file
(
$motd
))
unlink
(
$motd
);
if
(
@
is_file
(
$motd
)
||
@
is_link
(
$motd
)
)
unlink
(
$motd
);
file_put_contents
(
$motd
,
$tpl
->
grab
());
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment