- fixed apache vhost and ssl settings

- changed some rspamd config to new syntax

Author: Marius Burkard

server/conf/rspamd_antivirus.conf.master

@@ -2,7 +2,7 @@ clamav {
     # If set force this action if any virus is found (default unset: no action is forced)
     #action = "reject";
     # if `true` only messages with non-image attachments will be checked (default true)
-    attachments_only = true;
+    scan_mime_parts = true;
     # If `max_size` is set, messages > n bytes in size are not scanned
     #max_size = 20000000;
     # symbol to add (add it to metric if you want non-zero weight)

server/conf/rspamd_metrics.conf.master

@@ -0,0 +1,53 @@
+# RBL
+symbols = {
+	"RBL_SENDERSCORE" {
+		weight = 4.0;
+		description = "From address is listed in senderscore.com BL";
+	}
+	"RBL_SPAMHAUS_SBL" {
+		weight = 2.0;
+		description = "From address is listed in zen sbl";
+	}
+	"RBL_SPAMHAUS_CSS" {
+	  weight = 2.0;
+	  description = "From address is listed in zen css";
+	}
+	"RBL_SPAMHAUS_XBL" {
+	  weight = 4.0;
+	  description = "From address is listed in zen xbl";
+	}
+	"RBL_SPAMHAUS_XBL_ANY" {
+	  weight = 4.0;
+	  description = "From or receive address is listed in zen xbl (any list)";
+	}
+	"RBL_SPAMHAUS_PBL" {
+	  weight = 2.0;
+	  description = "From address is listed in zen pbl (ISP list)";
+	}
+	"RBL_SPAMHAUS_DROP" {
+	  weight = 7.0;
+	  description = "From address is listed in zen drop bl";
+	}
+	"RECEIVED_SPAMHAUS_XBL" {
+	  weight = 3.0;
+	  description = "Received address is listed in zen xbl";
+	  one_shot = true;
+	}
+	"RBL_MAILSPIKE_WORST" {
+	  weight = 2.0;
+	  description = "From address is listed in RBL - worst possible reputation";
+	}
+	"RBL_MAILSPIKE_VERYBAD" {
+	  weight = 1.5;
+	  description = "From address is listed in RBL - very bad reputation";
+	}
+	"RBL_MAILSPIKE_BAD" {
+	  weight = 1.0;
+	  description = "From address is listed in RBL - bad reputation";
+	}
+	"RBL_SEM" {
+	  weight = 1.0;
+	  description = "Address is listed in Spameatingmonkey RBL";
+	}
+	# /RBL
+}

server/conf/rspamd_metrics_override.conf.master

@@ -0,0 +1,108 @@
+symbols = {
+	# SURBL
+	"PH_SURBL_MULTI" {
+	  weight = 5.5;
+	  description = "SURBL: Phishing sites";
+	}
+	"MW_SURBL_MULTI" {
+	  weight = 5.5;
+	  description = "SURBL: Malware sites";
+	}
+	"ABUSE_SURBL" {
+	  weight = 5.5;
+	  description = "SURBL: ABUSE";
+	}
+	"CRACKED_SURBL" {
+	  weight = 4.0;
+	  description = "SURBL: cracked site";
+	}
+	"RAMBLER_URIBL" {
+	  weight = 4.5;
+	  description = "Rambler uribl";
+	  one_shot = true;
+	}
+	"RAMBLER_EMAILBL" {
+	  weight = 9.5;
+	  description = "Rambler emailbl";
+	  one_shot = true;
+	}
+	"MSBL_EBL" {
+	  weight = 7.5;
+	  description = "MSBL emailbl";
+	  one_shot = true;
+	}
+	"SEM_URIBL" {
+	  weight = 3.5;
+	  description = "Spameatingmonkey uribl";
+	}
+	"SEM_URIBL_FRESH15" {
+	  weight = 3.0;
+	  description = "Spameatingmonkey uribl. Domains registered in the last 15 days (.AERO,.BIZ,.COM,.INFO,.NAME,.NET,.PRO,.SK,.TEL,.US)";
+	}
+	"DBL" {
+	  weight = 0.0;
+	  description = "DBL unknown result";
+	}
+	"DBL_SPAM" {
+	  weight = 6.5;
+	  description = "DBL uribl spam";
+	}
+	"DBL_PHISH" {
+	  weight = 6.5;
+	  description = "DBL uribl phishing";
+	}
+	"DBL_MALWARE" {
+	  weight = 6.5;
+	  description = "DBL uribl malware";
+	}
+	"DBL_BOTNET" {
+	  weight = 5.5;
+	  description = "DBL uribl botnet C&C domain";
+	}
+	"DBL_ABUSE" {
+	  weight = 6.5;
+	  description = "DBL uribl abused legit spam";
+	}
+	"DBL_ABUSE_REDIR" {
+	  weight = 1.5;
+	  description = "DBL uribl abused spammed redirector domain";
+	}
+	"DBL_ABUSE_PHISH" {
+	  weight = 7.5;
+	  description = "DBL uribl abused legit phish";
+	}
+	"DBL_ABUSE_MALWARE" {
+	  weight = 7.5;
+	  description = "DBL uribl abused legit malware";
+	}
+	"DBL_ABUSE_BOTNET" {
+	  weight = 5.5;
+	  description = "DBL uribl abused legit botnet C&C";
+	}
+	"URIBL_BLACK" {
+	  weight = 7.5;
+	  description = "uribl.com black url";
+	}
+	"URIBL_RED" {
+	  weight = 3.5;
+	  description = "uribl.com red url";
+	}
+	"URIBL_GREY" {
+	  weight = 1.5;
+	  description = "uribl.com grey url";
+	  one_shot = true;
+	}
+	"URIBL_SBL" {
+	  weight = 6.5;
+	  description = "Spamhaus SBL URIBL";
+	}
+	"URIBL_SBL_CSS" {
+	  weight = 6.5;
+	  description = "Spamhaus SBL CSS URIBL";
+	}
+	"RBL_SARBL_BAD" {
+	  weight = 2.5;
+	  description = "A domain listed in the mail is blacklisted in SARBL";
+	}
+	# /SURBL
+}

server/conf/rspamd_override_rbl.conf.master

@@ -0,0 +1,15 @@
+subject = "***SPAM*** %s";
+symbols = {
+	"CLAM_VIRUS" {
+		weight = 50;
+		description = "Clamav has found a virus.";
+	}
+	"JUST_EICAR" {
+		weight = 50;
+		description = "Clamav has found a virus.";
+	}
+	"R_DUMMY" {
+		weight = 0.0;
+		description = "Dummy symbol";
+	}
+}

server/conf/rspamd_override_surbl.conf.master

@@ -67,7 +67,7 @@ public function get_acme_command($domains, $key_file, $bundle_file, $cert_file)
 			return false;
 		}
 
-		$cmd = $letsencrypt . " --issue $cmd -w /usr/local/ispconfig/interface/acme && " . $letsencrypt . " --install-cert " . $cmd . " --key-file " . escapeshellarg($key_file) . " --fullchain-file " . escapeshellarg($bundle_file) . " --cert-file " . escapeshellarg($cert_file) . " --reloadcmd " . escapeshellarg($this->get_reload_command());
+		$cmd = 'R=0 ; C=0 ; ' . $letsencrypt . ' --issue ' . $cmd . ' -w /usr/local/ispconfig/interface/acme ; R=$? ; if [[ $R -eq 0 || $R -eq 2 ]] ; then ' . $letsencrypt . ' --install-cert ' . $cmd . ' --key-file ' . escapeshellarg($key_file) . ' --fullchain-file ' . escapeshellarg($bundle_file) . ' --cert-file ' . escapeshellarg($cert_file) . ' --reloadcmd ' . escapeshellarg($this->get_reload_command()) . '; C=$? ; fi ; if [[ $C -eq 0 ]] ; then exit $R ; else exit $C  ; fi';
 
 		return $cmd;
 	}