Skip to content

Commit a091885

Browse files
author
Marius Burkard
committed
- ported rspamd support
1 parent cb67fdf commit a091885

Some content is hidden

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

42 files changed

+1205
-153
lines changed

‎install/sql/incremental/upd_dev_collection.sql‎

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,4 +151,38 @@ UPDATE `web_domain` as d INNER JOIN `server` as s ON (s.server_id = d.server_id)
151151

152152
UPDATE `web_domain` SET `php` = 'php-fpm' WHERE `php` = 'hhvm';
153153
UPDATE `web_domain` SET `php` = 'fast-cgi' WHERE `php` = 'cgi';
154-
UPDATE `web_domain` SET `php` = 'mod' WHERE `php` = 'suphp';
154+
UPDATE `web_domain` SET `php` = 'mod' WHERE `php` = 'suphp';
155+
156+
-- rspamd
157+
ALTER TABLE `spamfilter_policy` ADD `rspamd_greylisting` ENUM('n','y') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'n' AFTER `policyd_greylist`;
158+
ALTER TABLE `spamfilter_policy` ADD `rspamd_spam_greylisting_level` DECIMAL(5,2) NULL DEFAULT NULL AFTER `rspamd_greylisting`;
159+
ALTER TABLE `spamfilter_policy` ADD `rspamd_spam_tag_level` DECIMAL(5,2) NULL DEFAULT NULL AFTER `rspamd_spam_greylisting_level`;
160+
ALTER TABLE `spamfilter_policy` ADD `rspamd_spam_tag_method` ENUM('add_header','rewrite_subject') CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'rewrite_subject' AFTER `rspamd_spam_tag_level`;
161+
ALTER TABLE `spamfilter_policy` ADD `rspamd_spam_kill_level` DECIMAL(5,2) NULL DEFAULT NULL AFTER `rspamd_spam_tag_method`;
162+
163+
UPDATE `spamfilter_policy` SET `rspamd_greylisting` = 'y' WHERE id = 4;
164+
UPDATE `spamfilter_policy` SET `rspamd_greylisting` = 'y' WHERE id = 5;
165+
UPDATE `spamfilter_policy` SET `rspamd_greylisting` = 'y' WHERE id = 6;
166+
167+
UPDATE `spamfilter_policy` SET `rspamd_spam_greylisting_level` = '4.00';
168+
UPDATE `spamfilter_policy` SET `rspamd_spam_greylisting_level` = '6.00' WHERE id = 1;
169+
UPDATE `spamfilter_policy` SET `rspamd_spam_greylisting_level` = '999.00' WHERE id = 2;
170+
UPDATE `spamfilter_policy` SET `rspamd_spam_greylisting_level` = '999.00' WHERE id = 3;
171+
UPDATE `spamfilter_policy` SET `rspamd_spam_greylisting_level` = '2.00' WHERE id = 6;
172+
UPDATE `spamfilter_policy` SET `rspamd_spam_greylisting_level` = '7.00' WHERE id = 7;
173+
174+
UPDATE `spamfilter_policy` SET `rspamd_spam_tag_level` = '6.00';
175+
UPDATE `spamfilter_policy` SET `rspamd_spam_tag_level` = '8.00' WHERE id = 1;
176+
UPDATE `spamfilter_policy` SET `rspamd_spam_tag_level` = '999.00' WHERE id = 2;
177+
UPDATE `spamfilter_policy` SET `rspamd_spam_tag_level` = '999.00' WHERE id = 3;
178+
UPDATE `spamfilter_policy` SET `rspamd_spam_tag_level` = '4.00' WHERE id = 6;
179+
UPDATE `spamfilter_policy` SET `rspamd_spam_tag_level` = '10.00' WHERE id = 7;
180+
181+
UPDATE `spamfilter_policy` SET `rspamd_spam_kill_level` = '10.00';
182+
UPDATE `spamfilter_policy` SET `rspamd_spam_kill_level` = '12.00' WHERE id = 1;
183+
UPDATE `spamfilter_policy` SET `rspamd_spam_kill_level` = '999.00' WHERE id = 2;
184+
UPDATE `spamfilter_policy` SET `rspamd_spam_kill_level` = '999.00' WHERE id = 3;
185+
UPDATE `spamfilter_policy` SET `rspamd_spam_kill_level` = '8.00' WHERE id = 6;
186+
UPDATE `spamfilter_policy` SET `rspamd_spam_kill_level` = '20.00' WHERE id = 7;
187+
-- end of rspamd
188+

‎install/sql/ispconfig3.sql‎

Lines changed: 12 additions & 7 deletions
Large diffs are not rendered by default.

‎install/tpl/mailfilter.master‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎install/tpl/server.ini.master‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ homedir_path=/var/vmail
3838
maildir_format=maildir
3939
dkim_path=/var/lib/amavis/dkim
4040
dkim_strength=1024
41+
content_filter=rspamd
42+
rspamd_password=
4143
mailuser_uid=5000
4244
mailuser_gid=5000
4345
mailuser_name=vmail

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

Lines changed: 71 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,12 @@
331331
),
332332
'value' => '',
333333
'width' => '40',
334-
'maxlength' => '255'
334+
'maxlength' => '255',
335+
'filters' => array( 0 => array(
336+
'event' => 'SAVE',
337+
'type' => 'TRIM'
338+
),
339+
)
335340
),
336341
'monit_user' => array(
337342
'datatype' => 'VARCHAR',
@@ -345,15 +350,25 @@
345350
'default' => '',
346351
'value' => '',
347352
'width' => '40',
348-
'maxlength' => '255'
353+
'maxlength' => '255',
354+
'filters' => array( 0 => array(
355+
'event' => 'SAVE',
356+
'type' => 'TRIM'
357+
),
358+
)
349359
),
350360
'monit_password' => array(
351361
'datatype' => 'VARCHAR',
352362
'formtype' => 'TEXT',
353363
'default' => '',
354364
'value' => '',
355365
'width' => '40',
356-
'maxlength' => '255'
366+
'maxlength' => '255',
367+
'filters' => array( 0 => array(
368+
'event' => 'SAVE',
369+
'type' => 'TRIM'
370+
),
371+
)
357372
),
358373
'munin_url' => array(
359374
'datatype' => 'VARCHAR',
@@ -365,7 +380,12 @@
365380
),
366381
'value' => '',
367382
'width' => '40',
368-
'maxlength' => '255'
383+
'maxlength' => '255',
384+
'filters' => array( 0 => array(
385+
'event' => 'SAVE',
386+
'type' => 'TRIM'
387+
),
388+
)
369389
),
370390
'munin_user' => array(
371391
'datatype' => 'VARCHAR',
@@ -379,15 +399,25 @@
379399
'default' => '',
380400
'value' => '',
381401
'width' => '40',
382-
'maxlength' => '255'
402+
'maxlength' => '255',
403+
'filters' => array( 0 => array(
404+
'event' => 'SAVE',
405+
'type' => 'TRIM'
406+
),
407+
)
383408
),
384409
'munin_password' => array(
385410
'datatype' => 'VARCHAR',
386411
'formtype' => 'TEXT',
387412
'default' => '',
388413
'value' => '',
389414
'width' => '40',
390-
'maxlength' => '255'
415+
'maxlength' => '255',
416+
'filters' => array( 0 => array(
417+
'event' => 'SAVE',
418+
'type' => 'TRIM'
419+
),
420+
)
391421
),
392422
'nagios_url' => array(
393423
'datatype' => 'VARCHAR',
@@ -399,23 +429,38 @@
399429
),
400430
'value' => '',
401431
'width' => '40',
402-
'maxlength' => '255'
432+
'maxlength' => '255',
433+
'filters' => array( 0 => array(
434+
'event' => 'SAVE',
435+
'type' => 'TRIM'
436+
),
437+
)
403438
),
404439
'nagios_user' => array(
405440
'datatype' => 'VARCHAR',
406441
'formtype' => 'TEXT',
407442
'default' => '',
408443
'value' => '',
409444
'width' => '40',
410-
'maxlength' => '255'
445+
'maxlength' => '255',
446+
'filters' => array( 0 => array(
447+
'event' => 'SAVE',
448+
'type' => 'TRIM'
449+
),
450+
)
411451
),
412452
'nagios_password' => array(
413453
'datatype' => 'VARCHAR',
414454
'formtype' => 'TEXT',
415455
'default' => '',
416456
'value' => '',
417457
'width' => '40',
418-
'maxlength' => '255'
458+
'maxlength' => '255',
459+
'filters' => array( 0 => array(
460+
'event' => 'SAVE',
461+
'type' => 'TRIM'
462+
),
463+
)
419464
),
420465
'monitor_system_updates' => array(
421466
'datatype' => 'VARCHAR',
@@ -494,6 +539,23 @@
494539
'width' => '40',
495540
'maxlength' => '255'
496541
),
542+
'content_filter' => array(
543+
'datatype' => 'VARCHAR',
544+
'formtype' => 'SELECT',
545+
'default' => 'rspamd',
546+
'value' => array('amavisd' => 'Amavisd', 'rspamd' => 'Rspamd')
547+
),
548+
'rspamd_password' => array(
549+
'datatype' => 'VARCHAR',
550+
'formtype' => 'TEXT',
551+
'default' => '',
552+
'value' => '',
553+
'width' => '40',
554+
'maxlength' => '255',
555+
'filters' => array( 0 => array( 'event' => 'SAVE',
556+
'type' => 'TRIM'),
557+
),
558+
),
497559
'dkim_path' => array(
498560
'datatype' => 'VARCHAR',
499561
'formtype' => 'TEXT',

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,4 +299,7 @@ $wb['log_retention_txt'] = 'Log retention (days)';
299299
$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0';
300300
$wb['php_default_name_txt'] = 'Beschreibung Standard PHP';
301301
$wb['php_default_name_error_empty'] = 'Beschreibung Standard PHP ist leer.';
302-
?>
302+
$wb['content_filter_txt'] = 'Content-Filter';
303+
$wb['rspamd_url_txt'] = 'Rspamd-URL';
304+
$wb['rspamd_user_txt'] = 'Rspamd-Benutzer';
305+
$wb['rspamd_password_txt'] = 'Rspamd-Passwort';

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,4 +301,8 @@ $wb['log_retention_txt'] = 'Log retention (days)';
301301
$wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0';
302302
$wb['php_default_name_txt'] = 'Description Default PHP-Version';
303303
$wb['php_default_name_error_empty'] = 'Description Default PHP-Version must not be empty';
304-
?>
304+
$wb['content_filter_txt'] = 'Content Filter';
305+
$wb['rspamd_url_txt'] = 'Rspamd URL';
306+
$wb['rspamd_user_txt'] = 'Rspamd User';
307+
$wb['rspamd_password_txt'] = 'Rspamd Password';
308+

0 commit comments

Comments
 (0)