Merge branch '6128-rspamd-not-populating' into 'develop'

Marius Burkard · Marius Burkard · commit baf08d72e20b · 2021-04-09T08:46:21.000Z
Resolve "rspamd not populating"

Closes #6128

See merge request ispconfig/ispconfig3!1471
diff --git a/install/dist/conf/centos52.conf.php b/install/dist/conf/centos52.conf.php
@@ -147,6 +147,11 @@
 $conf['amavis']['config_dir'] = '/etc';
 $conf['amavis']['init_script'] = 'amavisd';
 
+//* Rspamd
+$conf['rspamd']['installed'] = false; // will be detected automatically during installation
+$conf['rspamd']['config_dir'] = '/etc/rspamd';
+$conf['rspamd']['init_script'] = 'rspamd';
+
 //* ClamAV
 $conf['clamav']['installed'] = false; // will be detected automatically during installation
 $conf['clamav']['init_script'] = 'clamd';
diff --git a/install/dist/conf/centos53.conf.php b/install/dist/conf/centos53.conf.php
@@ -147,6 +147,11 @@
 $conf['amavis']['config_dir'] = '/etc';
 $conf['amavis']['init_script'] = 'amavisd';
 
+//* Rspamd
+$conf['rspamd']['installed'] = false; // will be detected automatically during installation
+$conf['rspamd']['config_dir'] = '/etc/rspamd';
+$conf['rspamd']['init_script'] = 'rspamd';
+
 //* ClamAV
 $conf['clamav']['installed'] = false; // will be detected automatically during installation
 $conf['clamav']['init_script'] = 'clamd';
diff --git a/install/dist/conf/debian100.conf.php b/install/dist/conf/debian100.conf.php
@@ -153,6 +153,11 @@
 $conf['amavis']['config_dir'] = '/etc/amavis';
 $conf['amavis']['init_script'] = 'amavis';
 
+//* Rspamd
+$conf['rspamd']['installed'] = false; // will be detected automatically during installation
+$conf['rspamd']['config_dir'] = '/etc/rspamd';
+$conf['rspamd']['init_script'] = 'rspamd';
+
 //* ClamAV
 $conf['clamav']['installed'] = false; // will be detected automatically during installation
 $conf['clamav']['init_script'] = 'clamav-daemon';
diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php
@@ -147,6 +147,11 @@
 $conf['amavis']['config_dir'] = '/etc/amavis';
 $conf['amavis']['init_script'] = 'amavis';
 
+//* Rspamd
+$conf['rspamd']['installed'] = false; // will be detected automatically during installation
+$conf['rspamd']['config_dir'] = '/etc/rspamd';
+$conf['rspamd']['init_script'] = 'rspamd';
+
 //* ClamAV
 $conf['clamav']['installed'] = false; // will be detected automatically during installation
 $conf['clamav']['init_script'] = 'clamd';
diff --git a/server/plugins-available/rspamd_plugin.inc.php b/server/plugins-available/rspamd_plugin.inc.php
@@ -460,7 +460,7 @@ function spamfilter_wblist_update($event_name, $data) {
 				unlink($wblist_file);
 			}
 
-			if($mail_config['content_filter'] == 'rspamd' && is_file('/etc/init.d/rspamd')) {
+			if($mail_config['content_filter'] == 'rspamd') {
 				$app->services->restartServiceDelayed('rspamd', 'reload');
 			}
 		}
@@ -484,7 +484,7 @@ function spamfilter_wblist_delete($event_name, $data) {
 			}
 
 			if($mail_config['content_filter'] == 'rspamd'){
-				if(is_file('/etc/init.d/rspamd')) $app->services->restartServiceDelayed('rspamd', 'reload');
+				$app->services->restartServiceDelayed('rspamd', 'reload');
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -460,7 +460,7 @@ function spamfilter_wblist_update($event_name, $data) {`
`460`	`460`	`unlink($wblist_file);`
`461`	`461`	`}`
`462`	`462`
`463`		`- if($mail_config['content_filter'] == 'rspamd' && is_file('/etc/init.d/rspamd')) {`
	`463`	`+ if($mail_config['content_filter'] == 'rspamd') {`
`464`	`464`	`$app->services->restartServiceDelayed('rspamd', 'reload');`
`465`	`465`	`}`
`466`	`466`	`}`
`@@ -484,7 +484,7 @@ function spamfilter_wblist_delete($event_name, $data) {`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`if($mail_config['content_filter'] == 'rspamd'){`
`487`		`- if(is_file('/etc/init.d/rspamd')) $app->services->restartServiceDelayed('rspamd', 'reload');`
	`487`	`+ $app->services->restartServiceDelayed('rspamd', 'reload');`
`488`	`488`	`}`
`489`	`489`	`}`
`490`	`490`	`}`