Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISPConfig
ISPConfig 3
Commits
a8a32889
Commit
a8a32889
authored
Nov 17, 2008
by
tbrehm
Browse files
Create getmail cronjobs only if the getmail user exists.
parent
2c8f9400
Changes
3
Hide whitespace changes
Inline
Side-by-side
install/dist/lib/fedora.lib.php
View file @
a8a32889
...
...
@@ -690,6 +690,11 @@ class installer_dist extends installer_base {
exec
(
'crontab -u root -l > crontab.txt'
);
$existing_root_cron_jobs
=
file
(
'crontab.txt'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
foreach
(
$existing_root_cron_jobs
as
$key
=>
$val
)
{
if
(
stristr
(
$val
,
'/usr/local/ispconfig'
))
unset
(
$existing_root_cron_jobs
[
$key
]);
}
$root_cron_jobs
=
array
(
'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null'
,
'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
...
...
@@ -704,19 +709,27 @@ class installer_dist extends installer_base {
unlink
(
'crontab.txt'
);
//* Getmail crontab
$cf
=
$conf
[
'getmail'
];
exec
(
'crontab -u getmail -l > crontab.txt'
);
$existing_cron_jobs
=
file
(
'crontab.txt'
);
$cron_jobs
=
array
(
'*/5 * * * * '
.
$cf
[
'program'
]
.
' -g '
.
$cf
[
'config_dir'
]
.
' -r '
.
$cf
[
'config_dir'
]
.
'/*.conf &> /dev/null'
);
foreach
(
$cron_jobs
as
$cron_job
)
{
if
(
!
in_array
(
$cron_job
.
"
\n
"
,
$existing_cron_jobs
))
{
$existing_cron_jobs
[]
=
$cron_job
.
"
\n
"
;
if
(
is_user
(
'getmail'
))
{
$cf
=
$conf
[
'getmail'
];
exec
(
'crontab -u getmail -l > crontab.txt'
);
$existing_cron_jobs
=
file
(
'crontab.txt'
);
$cron_jobs
=
array
(
'*/5 * * * * '
.
$cf
[
'program'
]
.
' -g '
.
$cf
[
'config_dir'
]
.
' -r '
.
$cf
[
'config_dir'
]
.
'/*.conf &> /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
foreach
(
$cron_jobs
as
$key
=>
$val
)
{
if
(
stristr
(
$val
,
$cf
[
'program'
]))
unset
(
$cron_jobs
[
$key
]);
}
foreach
(
$cron_jobs
as
$cron_job
)
{
if
(
!
in_array
(
$cron_job
.
"
\n
"
,
$existing_cron_jobs
))
{
$existing_cron_jobs
[]
=
$cron_job
.
"
\n
"
;
}
}
file_put_contents
(
'crontab.txt'
,
$existing_cron_jobs
);
exec
(
'crontab -u getmail crontab.txt &> /dev/null'
);
unlink
(
'crontab.txt'
);
}
file_put_contents
(
'crontab.txt'
,
$existing_cron_jobs
);
exec
(
'crontab -u getmail crontab.txt &> /dev/null'
);
unlink
(
'crontab.txt'
);
}
}
...
...
install/dist/lib/opensuse.lib.php
View file @
a8a32889
...
...
@@ -708,6 +708,11 @@ class installer_dist extends installer_base {
exec
(
'crontab -u root -l > crontab.txt'
);
$existing_root_cron_jobs
=
file
(
'crontab.txt'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
foreach
(
$existing_root_cron_jobs
as
$key
=>
$val
)
{
if
(
stristr
(
$val
,
'/usr/local/ispconfig'
))
unset
(
$existing_root_cron_jobs
[
$key
]);
}
$root_cron_jobs
=
array
(
'* * * * * /usr/local/ispconfig/server/server.sh &> /dev/null'
,
'30 00 * * * /usr/local/ispconfig/server/cron_daily.sh &> /dev/null'
...
...
@@ -722,19 +727,27 @@ class installer_dist extends installer_base {
unlink
(
'crontab.txt'
);
//* Getmail crontab
$cf
=
$conf
[
'getmail'
];
exec
(
'crontab -u getmail -l > crontab.txt'
);
$existing_cron_jobs
=
file
(
'crontab.txt'
);
$cron_jobs
=
array
(
'*/5 * * * * '
.
$cf
[
'program'
]
.
' -g '
.
$cf
[
'config_dir'
]
.
' -r '
.
$cf
[
'config_dir'
]
.
'/*.conf &> /dev/null'
);
foreach
(
$cron_jobs
as
$cron_job
)
{
if
(
!
in_array
(
$cron_job
.
"
\n
"
,
$existing_cron_jobs
))
{
$existing_cron_jobs
[]
=
$cron_job
.
"
\n
"
;
if
(
is_user
(
'getmail'
))
{
$cf
=
$conf
[
'getmail'
];
exec
(
'crontab -u getmail -l > crontab.txt'
);
$existing_cron_jobs
=
file
(
'crontab.txt'
);
$cron_jobs
=
array
(
'*/5 * * * * '
.
$cf
[
'program'
]
.
' -g '
.
$cf
[
'config_dir'
]
.
' -r '
.
$cf
[
'config_dir'
]
.
'/*.conf &> /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
foreach
(
$cron_jobs
as
$key
=>
$val
)
{
if
(
stristr
(
$val
,
$cf
[
'program'
]))
unset
(
$cron_jobs
[
$key
]);
}
foreach
(
$cron_jobs
as
$cron_job
)
{
if
(
!
in_array
(
$cron_job
.
"
\n
"
,
$existing_cron_jobs
))
{
$existing_cron_jobs
[]
=
$cron_job
.
"
\n
"
;
}
}
file_put_contents
(
'crontab.txt'
,
$existing_cron_jobs
);
exec
(
'crontab -u getmail crontab.txt &> /dev/null'
);
unlink
(
'crontab.txt'
);
}
file_put_contents
(
'crontab.txt'
,
$existing_cron_jobs
);
exec
(
'crontab -u getmail crontab.txt &> /dev/null'
);
unlink
(
'crontab.txt'
);
}
}
...
...
install/lib/installer_base.lib.php
View file @
a8a32889
...
...
@@ -918,25 +918,27 @@ class installer_base {
unlink
(
'crontab.txt'
);
//* Getmail crontab
$cf
=
$conf
[
'getmail'
];
exec
(
'crontab -u getmail -l > crontab.txt'
);
$existing_cron_jobs
=
file
(
'crontab.txt'
);
if
(
is_user
(
'getmail'
))
{
$cf
=
$conf
[
'getmail'
];
exec
(
'crontab -u getmail -l > crontab.txt'
);
$existing_cron_jobs
=
file
(
'crontab.txt'
);
$cron_jobs
=
array
(
'*/5 * * * * '
.
$cf
[
'program'
]
.
' -g '
.
$cf
[
'config_dir'
]
.
' -r '
.
$cf
[
'config_dir'
]
.
'/*.conf > /dev/null'
);
$cron_jobs
=
array
(
'*/5 * * * * '
.
$cf
[
'program'
]
.
' -g '
.
$cf
[
'config_dir'
]
.
' -r '
.
$cf
[
'config_dir'
]
.
'/*.conf > /dev/null'
);
// remove existing ispconfig cronjobs, in case the syntax has changed
foreach
(
$cron_jobs
as
$key
=>
$val
)
{
if
(
stristr
(
$val
,
$cf
[
'program'
]))
unset
(
$cron_jobs
[
$key
]);
}
// remove existing ispconfig cronjobs, in case the syntax has changed
foreach
(
$cron_jobs
as
$key
=>
$val
)
{
if
(
stristr
(
$val
,
$cf
[
'program'
]))
unset
(
$cron_jobs
[
$key
]);
}
foreach
(
$cron_jobs
as
$cron_job
)
{
if
(
!
in_array
(
$cron_job
.
"
\n
"
,
$existing_cron_jobs
))
{
$existing_cron_jobs
[]
=
$cron_job
.
"
\n
"
;
foreach
(
$cron_jobs
as
$cron_job
)
{
if
(
!
in_array
(
$cron_job
.
"
\n
"
,
$existing_cron_jobs
))
{
$existing_cron_jobs
[]
=
$cron_job
.
"
\n
"
;
}
}
file_put_contents
(
'crontab.txt'
,
$existing_cron_jobs
);
exec
(
'crontab -u getmail crontab.txt &> /dev/null'
);
unlink
(
'crontab.txt'
);
}
file_put_contents
(
'crontab.txt'
,
$existing_cron_jobs
);
exec
(
'crontab -u getmail crontab.txt &> /dev/null'
);
unlink
(
'crontab.txt'
);
}
}
...
...
Write
Preview
Supports
Markdown
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