Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
I
ISPConfig 3
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ISPConfig
ISPConfig 3
Commits
2c7ee0fd
Commit
2c7ee0fd
authored
15 years ago
by
mcramer
Browse files
Options
Downloads
Patches
Plain Diff
Fixed: Correct chroot handling of cron jobs
Changed: separate crontab files for chrooted and other cron jobs
parent
0b0dc90a
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!46
Master
,
!21
Master
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
server/plugins-available/cron_plugin.inc.php
+30
-4
30 additions, 4 deletions
server/plugins-available/cron_plugin.inc.php
with
30 additions
and
4 deletions
server/plugins-available/cron_plugin.inc.php
+
30
−
4
View file @
2c7ee0fd
...
...
@@ -159,7 +159,6 @@ class cron_plugin {
$client_id
=
intval
(
$client
[
"client_id"
]);
unset
(
$client
);
/** TODO remove deleted record **/
$this
->
parent_domain
=
$parent_domain
;
$this
->
_write_crontab
();
}
...
...
@@ -174,7 +173,13 @@ class cron_plugin {
//* try to find customer's mail address
/** TODO: add possibility for client to choose mail notification! **/
$cron_content
=
"MAILTO=''
\n\n
"
;
$chr_cron_content
=
"MAILTO=''
\n\n
"
;
$chr_cron_content
.
=
"SHELL='/usr/sbin/jk_chrootsh'
\n\n
"
;
$cmd_count
=
0
;
$chr_cmd_count
=
0
;
//* read all active cron jobs from database and write them to file
$cron_jobs
=
$app
->
db
->
queryAllRecords
(
"SELECT `run_min`, `run_hour`, `run_mday`, `run_month`, `run_wday`, `command`, `type` FROM `cron` WHERE `parent_domain_id` = "
.
intval
(
$this
->
parent_domain
[
"domain_id"
])
.
" AND `active` = 'y'"
);
...
...
@@ -196,14 +201,35 @@ class cron_plugin {
if
(
substr
(
$job
[
'command'
],
0
,
1
)
!=
"/"
)
$command
.
=
$this
->
parent_domain
[
'document_root'
];
$command
.
=
$job
[
'command'
];
}
$cron_content
.
=
$command
.
"
\n
"
;
if
(
$job
[
'type'
]
==
'chrooted'
)
{
$chr_cron_content
.
=
$command
.
"
\n
"
;
$chr_cmd_count
++
;
}
else
{
$cron_content
.
=
$command
.
"
\n
"
;
$cmd_count
++
;
}
}
}
$cron_file
=
escapeshellcmd
(
$cron_config
[
"crontab_dir"
]
.
'/ispc_'
.
$this
->
parent_domain
[
"system_user"
]);
file_put_contents
(
$cron_file
,
$cron_content
);
if
(
$cmd_count
>
0
)
{
file_put_contents
(
$cron_file
,
$cron_content
);
$app
->
log
(
"Wrote Cron file
$cron_file
with content:
\n
$cron_content
"
,
LOGLEVEL_DEBUG
);
}
else
{
@
unlink
(
$cron_file
);
$app
->
log
(
"Deleted Cron file
$cron_file
"
,
LOGLEVEL_DEBUG
);
}
$cron_file
=
escapeshellcmd
(
$cron_config
[
"crontab_dir"
]
.
'/ispc_chrooted_'
.
$this
->
parent_domain
[
"system_user"
]);
if
(
$chr_cmd_count
>
0
)
{
file_put_contents
(
$cron_file
,
$chr_cron_content
);
$app
->
log
(
"Wrote Cron file
$cron_file
with content:
\n
$chr_cron_content
"
,
LOGLEVEL_DEBUG
);
}
else
{
@
unlink
(
$cron_file
);
$app
->
log
(
"Deleted Cron file
$cron_file
"
,
LOGLEVEL_DEBUG
);
}
$app
->
log
(
"Wrote Cron file
$cron_file
with content:
\n
$cron_content
"
,
LOGLEVEL_DEBUG
);
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment