Skip to content

Commit c00edf2

Browse files
author
Till Brehm
committed
Merge branch 'move_to_junk' into 'stable-3.1'
select Move to Junk before/after custom filters See merge request ispconfig/ispconfig3!1058
2 parents aab989f + 36b3648 commit c00edf2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+274
-228
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,7 @@ ALTER TABLE `web_domain` DROP COLUMN `enable_spdy`;
4646
ALTER TABLE `web_domain` ADD `folder_directive_snippets` TEXT NULL AFTER `https_port`;
4747

4848
ALTER TABLE `web_domain` CHANGE `apache_directives` `apache_directives` mediumtext NULL DEFAULT NULL;
49-
ALTER TABLE `web_domain` CHANGE `nginx_directives` `nginx_directives` mediumtext NULL DEFAULT NULL;
49+
ALTER TABLE `web_domain` CHANGE `nginx_directives` `nginx_directives` mediumtext NULL DEFAULT NULL;
50+
51+
-- add move to junk before/after option, default to after
52+
ALTER TABLE `mail_user` MODIFY `move_junk` enum('y','a','n') NOT NULL DEFAULT 'y';

‎install/sql/ispconfig3.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,7 @@ CREATE TABLE `mail_user` (
10461046
`autoresponder_end_date` datetime NULL default NULL,
10471047
`autoresponder_subject` varchar(255) NOT NULL default 'Out of office reply',
10481048
`autoresponder_text` mediumtext NULL,
1049-
`move_junk` enum('n','y') NOT NULL default 'n',
1049+
`move_junk` enum('y','a','n') NOT NULL default 'y',
10501050
`purge_trash_days` INT NOT NULL DEFAULT '0',
10511051
`purge_junk_days` INT NOT NULL DEFAULT '0',
10521052
`custom_mailfilter` mediumtext,

‎install/tpl/debian6_dovecot.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ plugin {
6060
# no longer needed, as 'sieve' is in userdb extra fields:
6161
sieve=/var/vmail/%d/%n/.sieve
6262

63+
sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
6364
sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
6465
sieve_max_script_size = 2M
6566
sieve_max_actions = 100

‎install/tpl/debian6_dovecot2.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ plugin {
2929
# no longer needed, as 'sieve' is in userdb extra fields:
3030
sieve=/var/vmail/%d/%n/.sieve
3131

32+
sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
3233
sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
3334
sieve_max_script_size = 2M
3435
sieve_max_actions = 100

‎install/tpl/debian_dovecot.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,6 +1145,7 @@ plugin {
11451145
# and they're not deleted automatically (use a cronjob or something).
11461146
#lazy_expunge = .EXPUNGED/ .DELETED/ .DELETED/.EXPUNGED/
11471147

1148+
sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
11481149
sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
11491150
sieve_max_script_size = 2M
11501151
sieve_max_actions = 100

‎install/tpl/debian_dovecot2.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ plugin {
2828
# no longer needed, as 'sieve' is in userdb extra fields:
2929
sieve=/var/vmail/%d/%n/.sieve
3030

31+
sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
3132
sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
3233
sieve_max_script_size = 2M
3334
sieve_max_actions = 100

‎install/tpl/fedora_dovecot.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,6 +1306,7 @@ plugin {
13061306
# ManageSieve this is where the uploaded scripts are stored.
13071307
sieve_dir=~/sieve
13081308

1309+
sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
13091310
sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
13101311
sieve_max_script_size = 2M
13111312
sieve_max_actions = 100

‎install/tpl/fedora_dovecot2.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ plugin {
2626
# no longer needed, as 'sieve' is in userdb extra fields:
2727
sieve=/var/vmail/%d/%n/.sieve
2828

29+
sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
2930
sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
3031
sieve_max_script_size = 2M
3132
sieve_max_actions = 100

‎install/tpl/opensuse_dovecot.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,6 +1280,7 @@ plugin {
12801280
# ManageSieve this is where the uploaded scripts are stored.
12811281
sieve_dir=~/sieve
12821282

1283+
sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
12831284
sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
12841285
sieve_max_script_size = 2M
12851286
sieve_max_actions = 100

‎install/tpl/opensuse_dovecot2.conf.master‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ plugin {
2525
# no longer needed, as 'sieve' is in userdb extra fields:
2626
sieve=/var/vmail/%d/%n/.sieve
2727

28+
sieve_before=/var/vmail/%d/%n/.ispconfig-before.sieve
2829
sieve_after=/var/vmail/%d/%n/.ispconfig.sieve
2930
sieve_max_script_size = 2M
3031
sieve_max_actions = 100

0 commit comments

Comments
 (0)