Skip to content

Commit b60fcff

Browse files
author
Till Brehm
committed
Merge branch '6445-cleanup-cron' into 'develop'
Integrate handle_mailbox_soft_deleted.sh into 500-clean_mailboxes.inc.php Closes #6445 See merge request ispconfig/ispconfig3!1733
2 parents 7d95da6 + 046ba49 commit b60fcff

34 files changed

+262
-164
lines changed

‎install/lib/installer_base.lib.php‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3922,10 +3922,6 @@ public function install_crontab() {
39223922
$root_cron_jobs[] = "0 0 * * * ".$install_dir."/server/scripts/create_daily_nginx_access_logs.sh &> /dev/null";
39233923
}
39243924

3925-
if ($conf['services']['mail'] == 1) {
3926-
$root_cron_jobs[] = "30 23 * * * ".$install_dir."/server/scripts/handle_mailbox_soft_deleted.sh &> /dev/null";
3927-
}
3928-
39293925
foreach($root_cron_jobs as $cron_job) {
39303926
if(!in_array($cron_job."\n", $existing_root_cron_jobs)) {
39313927
$existing_root_cron_jobs[] = $cron_job."\n";

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ UPDATE `dns_ssl_ca` SET `ca_issue` = 'sectigo.com' WHERE `ca_issue` = 'comodo.co
66
UPDATE `dns_ssl_ca` SET `ca_issue` = 'sectigo.com' WHERE `ca_issue` = 'comodoca.com';
77
UPDATE `dns_ssl_ca` SET `ca_name` = 'Sectigo (formerly Comodo CA)' WHERE `ca_issue` = 'sectigo.com';
88
-- not updating the dns_rr table to change all CAA records that have comodo.com / comodoca.com - we should not touch users records imo - TP
9+
-- #6445 Update the mailbox_soft_delete config option to it's new structure.
10+
-- UPDATE server SET config=REGEXP_REPLACE(config, 'mailbox_soft_delete=n', 'mailbox_soft_delete=0') WHERE config LIKE '%mailbox_soft_delete=n%'
11+
-- UPDATE server SET config=REGEXP_REPLACE(config, 'mailbox_soft_delete=y', 'mailbox_soft_delete=7') WHERE config LIKE '%mailbox_soft_delete=y%'

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ relayhost_user=
5656
relayhost_password=
5757
mailbox_size_limit=0
5858
message_size_limit=0
59-
mailbox_soft_delete=n
59+
mailbox_soft_delete=0
6060
mailbox_quota_stats=y
6161
realtime_blackhole_list=zen.spamhaus.org
6262
overquota_notify_threshold=90

‎interface/web/admin/form/server_config.tform.php‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -736,9 +736,17 @@
736736
),
737737
'mailbox_soft_delete' => array (
738738
'datatype' => 'VARCHAR',
739-
'formtype' => 'CHECKBOX',
739+
'formtype' => 'SELECT',
740740
'default' => 'n',
741-
'value' => array(0 => 'n', 1 => 'y')
741+
'value' => array(
742+
0 => 'soft_delete_directly_txt',
743+
-1 => 'soft_delete_keep_indefinitely_txt',
744+
1 => 'soft_delete_keep_1_txt',
745+
7 => 'soft_delete_keep_7_txt',
746+
30 => 'soft_delete_keep_30_txt',
747+
90 => 'soft_delete_keep_90_txt',
748+
365 => 'soft_delete_keep_365_txt',
749+
)
742750
),
743751
'mailbox_quota_stats' => array (
744752
'datatype' => 'VARCHAR',

‎interface/web/admin/lib/lang/ar_server_config.lng‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,10 @@ $wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master
351351
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
352352
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
353353
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
354-
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';
354+
$wb['soft_delete_directly_txt'] = 'Delete instantly';
355+
$wb['soft_delete_keep_indefinitely_txt'] = 'Rename but don\'t delete (manual cleanup)';
356+
$wb['soft_delete_keep_1_txt'] = 'Purge after 1 day';
357+
$wb['soft_delete_keep_7_txt'] = 'Purge after 7 days';
358+
$wb['soft_delete_keep_30_txt'] = 'Purge after 30 days';
359+
$wb['soft_delete_keep_90_txt'] = 'Purge after 90 days';
360+
$wb['soft_delete_keep_365_txt'] = 'Purge after 365 days';

‎interface/web/admin/lib/lang/bg_server_config.lng‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,10 @@ $wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master
351351
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
352352
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
353353
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
354-
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';
354+
$wb['soft_delete_directly_txt'] = 'Delete instantly';
355+
$wb['soft_delete_keep_indefinitely_txt'] = 'Rename but don\'t delete (manual cleanup)';
356+
$wb['soft_delete_keep_1_txt'] = 'Purge after 1 day';
357+
$wb['soft_delete_keep_7_txt'] = 'Purge after 7 days';
358+
$wb['soft_delete_keep_30_txt'] = 'Purge after 30 days';
359+
$wb['soft_delete_keep_90_txt'] = 'Purge after 90 days';
360+
$wb['soft_delete_keep_365_txt'] = 'Purge after 365 days';

‎interface/web/admin/lib/lang/br_server_config.lng‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,10 @@ $wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master
351351
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
352352
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
353353
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
354-
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';
354+
$wb['soft_delete_directly_txt'] = 'Delete instantly';
355+
$wb['soft_delete_keep_indefinitely_txt'] = 'Rename but don\'t delete (manual cleanup)';
356+
$wb['soft_delete_keep_1_txt'] = 'Purge after 1 day';
357+
$wb['soft_delete_keep_7_txt'] = 'Purge after 7 days';
358+
$wb['soft_delete_keep_30_txt'] = 'Purge after 30 days';
359+
$wb['soft_delete_keep_90_txt'] = 'Purge after 90 days';
360+
$wb['soft_delete_keep_365_txt'] = 'Purge after 365 days';

‎interface/web/admin/lib/lang/ca_server_config.lng‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,10 @@ $wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master
351351
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
352352
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
353353
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
354-
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';
354+
$wb['soft_delete_directly_txt'] = 'Delete instantly';
355+
$wb['soft_delete_keep_indefinitely_txt'] = 'Rename but don\'t delete (manual cleanup)';
356+
$wb['soft_delete_keep_1_txt'] = 'Purge after 1 day';
357+
$wb['soft_delete_keep_7_txt'] = 'Purge after 7 days';
358+
$wb['soft_delete_keep_30_txt'] = 'Purge after 30 days';
359+
$wb['soft_delete_keep_90_txt'] = 'Purge after 90 days';
360+
$wb['soft_delete_keep_365_txt'] = 'Purge after 365 days';

‎interface/web/admin/lib/lang/cn_server_config.lng‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,10 @@ $wb['jailkit_hardlinks_allow_txt'] = '允许狱中硬链接';
351351
$wb['jailkit_hardlinks_no_txt'] = '不，删除硬链接文件';
352352
$wb['jailkit_hardlinks_yes_txt'] = '是的，如果可能，使用硬链接';
353353
$wb['mailbox_soft_delete_txt'] = '邮箱软删除';
354-
$wb['mailbox_soft_delete_info_txt'] = '默认情况下，7天后清理。';
354+
$wb['soft_delete_directly_txt'] = 'Delete instantly';
355+
$wb['soft_delete_keep_indefinitely_txt'] = 'Rename but don\'t delete (manual cleanup)';
356+
$wb['soft_delete_keep_1_txt'] = 'Purge after 1 day';
357+
$wb['soft_delete_keep_7_txt'] = 'Purge after 7 days';
358+
$wb['soft_delete_keep_30_txt'] = 'Purge after 30 days';
359+
$wb['soft_delete_keep_90_txt'] = 'Purge after 90 days';
360+
$wb['soft_delete_keep_365_txt'] = 'Purge after 365 days';

‎interface/web/admin/lib/lang/cz_server_config.lng‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,4 +351,10 @@ $wb['bind_zonefiles_masterprefix_error_regex'] = 'Invalid BIND zonefiles master
351351
$wb['bind_zonefiles_slaveprefix_error_regex'] = 'Invalid BIND zonefiles slave prefix.';
352352
$wb['bind_keyfiles_dir_error_regex'] = 'Invalid BIND keyfiles directory.';
353353
$wb['mailbox_soft_delete_txt'] = 'Mailbox soft delete';
354-
$wb['mailbox_soft_delete_info_txt'] = 'by default cleaned up after 7 days.';
354+
$wb['soft_delete_directly_txt'] = 'Delete instantly';
355+
$wb['soft_delete_keep_indefinitely_txt'] = 'Rename but don\'t delete (manual cleanup)';
356+
$wb['soft_delete_keep_1_txt'] = 'Purge after 1 day';
357+
$wb['soft_delete_keep_7_txt'] = 'Purge after 7 days';
358+
$wb['soft_delete_keep_30_txt'] = 'Purge after 30 days';
359+
$wb['soft_delete_keep_90_txt'] = 'Purge after 90 days';
360+
$wb['soft_delete_keep_365_txt'] = 'Purge after 365 days';

0 commit comments

Comments
 (0)