implementation start of rspam/antispam feature

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

lng/ca.lng.php

@@ -629,45 +629,6 @@ return [
 		'mysqlserver' => 'Servidor mysql utilitzable'
 	],
 	'diskquota' => 'Quota',
-	'dkim' => [
-		'dkim_prefix' => [
-			'title' => 'Prefix',
-			'description' => 'Especifiqueu la ruta als fitxers DKIM RSA i als fitxers de configuració del plugin Milter'
-		],
-		'dkim_domains' => [
-			'title' => 'Nom del fitxer dels dominis',
-			'description' => '<em>Nom de fitxer</em> del paràmetre DKIM Domains especificat a la configuració dkim-milter'
-		],
-		'dkim_dkimkeys' => [
-			'title' => 'Nom de l\'arxiu KeyList',
-			'description' => '<em>Nom de fitxer</em> del paràmetre DKIM KeyList especificat a la configuració de dkim-milter'
-		],
-		'dkimrestart_command' => [
-			'title' => 'Ordre de reinici del filtre',
-			'description' => 'Especifiqui l\'ordre de reinici del servei DKIM milter'
-		],
-		'privkeysuffix' => [
-			'title' => 'Sufix de claus privades',
-			'description' => 'Pot especificar una extensió/sufix de nom de fitxer (opcional) per a les claus privades dkim generades. Alguns serveis com dkim-filter requereixen que estigui buit.'
-		],
-		'use_dkim' => [
-			'title' => 'Activar suport DKIM?',
-			'description' => 'Voleu utilitzar el sistema de claus de domini (DKIM)?<br/><em class="text-danger">Nota: DKIM només és compatible amb dkim-filter, no amb opendkim (de moment)</em>'
-		],
-		'dkim_algorithm' => [
-			'title' => 'Algorismes Hash permesos',
-			'description' => 'Defineix els algorismes hash permesos, escull "Tots" per a tots els algorismes o un o més dels altres algorismes disponibles'
-		],
-		'dkim_servicetype' => 'Tipus de servei',
-		'dkim_keylength' => [
-			'title' => 'Longitud de clau',
-			'description' => 'Atenció: Si canvia aquests valors, haurà d\'eliminar totes les claus privades/públiques de "%s".'
-		],
-		'dkim_notes' => [
-			'title' => 'Notes DKIM',
-			'description' => 'Notes que podrien ser d\'interès per a un humà, per exemple, una URL com http://www.dnswatch.info. Cap programa no realitza cap interpretació. Aquesta etiqueta s\'ha de fer servir amb moderació a causa de les limitacions d\'espai al DNS. Està pensada perquè la facin servir els administradors, no els usuaris finals.'
-		]
-	],
 	'dns' => [
 		'destinationip' => 'IP(s) del domini',
 		'standardip' => 'IP estàndard del servidor',

lng/de.lng.php

@@ -264,7 +264,7 @@ return [
 		'text' => 'Nachricht',
 		'sslsettings' => 'SSL-Einstellungen',
 		'specialsettings_replacements' => 'Die folgenden Variablen können verwendet werden:<br/><code>{DOMAIN}</code>, <code>{DOCROOT}</code>, <code>{CUSTOMER}</code>, <code>{IP}</code>, <code>{PORT}</code>, <code>{SCHEME}</code>, <code>{FPMSOCKET}</code> (wenn zutreffend)<br/>',
-		'dkimsettings' => 'DomainKey-Einstellungen',
+		'antispam_settings' => 'Antispam-Einstellungen',
 		'caneditphpsettings' => 'Kann PHP-bezogene Domaineinstellungen vornehmen?',
 		'allips' => 'Alle IP-Adressen',
 		'awstatssettings' => 'AWstats-Einstellungen',
@@ -595,43 +595,38 @@ return [
 		'mysqlserver' => 'Erlaubte MySQL-Server',
 	],
 	'diskquota' => 'Quota',
-	'dkim' => [
-		'dkim_prefix' => [
-			'title' => 'Prefix',
-			'description' => 'Wie lautet der Pfad zu den DKIM-RSA-Dateien sowie den Einstellungsdateien des Milter-Plugins?',
+	'antispam' => [
+		'config_file' => [
+			'title' => 'Antispam Konfigurationsdatei',
+			'description' => 'Pfad + Dateiname der Antispam-Regel Konfigurationsdatei',
 		],
-		'dkim_domains' => [
-			'title' => 'Domains-Dateiname',
-			'description' => 'Dateiname der DKIM-Domains-Angabe aus der DKIM-Milter-Konfigurationsdatei.',
+		'reload_command' => [
+			'title' => 'Milter-Restart-Befehl',
+			'description' => 'Wie lautet der Befehl zum Neustarten des rspamd-Dienstes?',
 		],
-		'dkim_dkimkeys' => [
-			'title' => 'KeyList Dateiname',
-			'description' => 'Dateiname der DKIM-KeyList-Angabe aus der DKIM-Milter-Konfigurationsdatei.',
+		'activated' => [
+			'title' => 'Antispam aktivieren?',
+			'description' => 'Aktivieren, um rspamd als Antispam Dienst zu verwenden.',
 		],
-		'dkimrestart_command' => [
-			'title' => 'Milter-Restart-Kommando',
-			'description' => 'Wie lautet das Kommando zum Neustarten des DKIM-Milter-Dienstes?',
-		],
-		'privkeysuffix' => [
-			'title' => 'Suffix für Private Keys',
-			'description' => 'Hier kann eine (optionale) Dateiendung für die generierten Private Keys angegeben werden. Manche Dienste, wie dkim-filter, erwarten, dass die Schlüssel keine Dateiendung haben (leer).',
-		],
-		'use_dkim' => [
-			'title' => 'DKIM-Support aktivieren?',
-			'description' => 'Wollen Sie das Domain-Keys-System (DKIM) benutzen?<br/><em class="text-danger">Hinweis: Derzeit wird DKIM nur via dkim-filter unterstützt, nicht opendkim.</em>',
-		],
-		'dkim_algorithm' => [
-			'title' => 'Gültige Hash-Algorithmen',
-			'description' => 'Wählen Sie einen Algorithmus, "All" für alle Algorithmen oder einen oder mehrere von den verfügbaren Algorithmen.',
-		],
-		'dkim_servicetype' => 'Service Typen',
 		'dkim_keylength' => [
-			'title' => 'Schlüssel-Länge',
-			'description' => 'Achtung: Bei Änderung dieser Einstellung müssen alle private/public Schlüssel in "%s" gelöscht werden.',
+			'title' => 'DKIM Schlüssel-Länge',
+			'description' => 'Achtung: Änderungen sind nur für neue Schlüssel gültig.<br/><br/>Erfordert einen speziellen DNS Eintrag für die Domain. Wenn das Nameserver-Feature nicht genutzt wird, muss dieser Eintrag manuell verwaltet werden.',
 		],
-		'dkim_notes' => [
-			'title' => 'DKIM Notiz',
-			'description' => 'Eine Notiz, welche für Menschen interessant sein könnte, z.B. eine URL wie http://www.dnswatch.info. Es gibt keine programmgesteuerte Interpretation für dieses Feld. Gehen Sie sparsam mit der Anzahl der Zeichen um, da es Einschränkungen seitens des DNS-Dienstes gibt. Dieses Feld ist für Administratoren gedacht, nicht für Benutzer.',
+		'spam_tag_level' => [
+			'title' => 'Spam Markierungs-Level',
+			'description' => 'Erforderliche Punktzahl zum Markieren einer E-Mail als Spam<br/>Standard: 7.0'
+		],
+		'spam_kill_level' => [
+			'title' => 'Spam Ignorier-Level',
+			'description' => 'Erforderliche Punktzahl für das Ablehnen einer E-Mail<br/>Standard: 14.0'
+		],
+		'bypass_spam' => [
+			'title' => 'Spamfilter umgehen',
+			'description' => 'Aktivieren, um den Spamfilter für diese Adresse zu umgehen/deaktivieren.<br/>Standard: Nein'
+		],
+		'policy_greylist' => [
+			'title' => 'Verwende greylisting',
+			'description' => 'Eingehende E-Mails mittels <a href="https://de.wikipedia.org/wiki/Greylisting" target="_blank">Greylisting</a> schützen.<br/>Standard: Ja'
 		],
 	],
 	'dns' => [
@@ -2108,9 +2103,19 @@ Vielen Dank, Ihr Administrator',
 		],
 	],
 	'spf' => [
-		'use_spf' => 'Aktiviere SPF für Domains?',
+		'use_spf' => [
+			'title' => 'Aktiviere SPF für Domains?',
+			'description' => 'Erfordert einen speziellen DNS Eintrag für die Domain. Wenn das Nameserver-Feature nicht genutzt wird, muss dieser Eintrag manuell verwaltet werden.',
+		],
 		'spf_entry' => 'SPF-Eintrag für alle Domains',
 	],
+	'dmarc' => [
+		'use_dmarc' => [
+			'title' => 'Aktiviere DMARC für Domains?',
+			'description' => 'Erfordert einen speziellen DNS Eintrag für die Domain. Wenn das Nameserver-Feature nicht genutzt wird, muss dieser Eintrag manuell verwaltet werden.',
+		],
+		'dmarc_entry' => 'DMARC-Eintrag für alle Domains',
+	],
 	'success' => [
 		'messages_success' => 'Nachricht erfolgreich an "%s" Empfänger gesendet',
 		'success' => 'Information',

lng/en.lng.php

@@ -268,7 +268,7 @@ return [
 		'text' => 'Message',
 		'sslsettings' => 'SSL settings',
 		'specialsettings_replacements' => 'You can use the following variables:<br/><code>{DOMAIN}</code>, <code>{DOCROOT}</code>, <code>{CUSTOMER}</code>, <code>{IP}</code>, <code>{PORT}</code>, <code>{SCHEME}</code>, <code>{FPMSOCKET}</code> (if applicable)<br/>',
-		'dkimsettings' => 'DomainKey settings',
+		'antispam_settings' => 'Antispam settings',
 		'caneditphpsettings' => 'Can change php-related domain settings?',
 		'allips' => 'All IP\'s',
 		'awstatssettings' => 'AWstats settings',
@@ -644,43 +644,38 @@ return [
 		'mysqlserver' => 'Usable mysql-server',
 	],
 	'diskquota' => 'Quota',
-	'dkim' => [
-		'dkim_prefix' => [
-			'title' => 'Prefix',
-			'description' => 'Please specify the path to the DKIM RSA-files as well as to the configuration files for the Milter-plugin',
+	'antispam' => [
+		'config_file' => [
+			'title' => 'Antispam settings file',
+			'description' => 'Please specify the filename for the email-antispam rules',
 		],
-		'dkim_domains' => [
-			'title' => 'Domains filename',
-			'description' => '<em>Filename</em> of the DKIM Domains parameter specified in the dkim-milter configuration',
-		],
-		'dkim_dkimkeys' => [
-			'title' => 'KeyList filename',
-			'description' => '<em>Filename</em> of the  DKIM KeyList parameter specified in the dkim-milter configuration',
-		],
-		'dkimrestart_command' => [
+		'reload_command' => [
 			'title' => 'Milter restart command',
-			'description' => 'Please specify the restart command for the DKIM milter service',
+			'description' => 'Please specify the restart command for the rspamd service',
 		],
-		'privkeysuffix' => [
-			'title' => 'Private keys suffix',
-			'description' => 'You can specify an (optional) filename extension/suffix for the generate dkim private keys. Some services like dkim-filter requires this to be empty',
+		'activated' => [
+			'title' => 'Activate antispam?',
+			'description' => 'Would you like to use rspamd as antispam service?',
 		],
-		'use_dkim' => [
-			'title' => 'Activate DKIM support?',
-			'description' => 'Would you like to use the Domain Keys (DKIM) system?<br/><em class="text-danger">Note: DKIM is only supported using dkim-filter, not opendkim (yet)</em>',
-		],
-		'dkim_algorithm' => [
-			'title' => 'Allowed Hash Algorithms',
-			'description' => 'Define allowed hash algorithms, chose "All" for all algorithms or one or more from the other available algorithms',
-		],
-		'dkim_servicetype' => 'Service Types',
 		'dkim_keylength' => [
-			'title' => 'Key-length',
-			'description' => 'Attention: If you change this values, you need to delete all the private/public keys in "%s"',
+			'title' => 'DKIM Key-length',
+			'description' => 'Attention: Changes will only apply for new keys<br/><br/>Requires a specific dns entry for the domain. If you are not using the nameserver feature, you will have to manually manage these entries.',
 		],
-		'dkim_notes' => [
-			'title' => 'DKIM Notes',
-			'description' => 'Notes that might be of interest to a human, e.g. a URL like http://www.dnswatch.info. No interpretation is made by any program. This tag should be used sparingly due to space limitations in DNS. This is intended for use by administrators, not end users.',
+		'spam_tag_level' => [
+			'title' => 'Spam tag level',
+			'description' => 'Score that is required to mark an email as spam<br/>Default: 7.0'
+		],
+		'spam_kill_level' => [
+			'title' => 'Spam kill level',
+			'description' => 'Score that is required to discard an email entirely<br/>Default: 14.0'
+		],
+		'bypass_spam' => [
+			'title' => 'Bypass spamfilter',
+			'description' => 'Activate to bypass/disable spamfiltering for this address.<br/>Default: no'
+		],
+		'policy_greylist' => [
+			'title' => 'Use greylisting',
+			'description' => 'Incoming emails will be protected by <a href="https://en.wikipedia.org/wiki/Greylisting_(email)" target="_blank">greylisting</a>.<br/>Default: yes'
 		],
 	],
 	'dns' => [
@@ -2236,9 +2231,19 @@ Yours sincerely, your administrator',
 		],
 	],
 	'spf' => [
-		'use_spf' => 'Activate SPF for domains?',
+		'use_spf' => [
+			'title' => 'Activate SPF for domains?',
+			'description' => 'Requires a specific dns entry for the domain. If you are not using the nameserver feature, you will have to manually manage these entries.',
+		],
 		'spf_entry' => 'SPF entry for all domains',
 	],
+	'dmarc' => [
+		'use_dmarc' => [
+			'title' => 'Activate DMARC for domains?',
+			'description' => 'Requires a specific dns entry for the domain. If you are not using the nameserver feature, you will have to manually manage these entries.',
+		],
+		'dmarc_entry' => 'DMARC entry for all domains',
+	],
 	'ssl_certificates' => [
 		'certificate_for' => 'Certificate for',
 		'valid_from' => 'Valid from',

lng/es.lng.php

@@ -628,45 +628,6 @@ return [
 		'mysqlserver' => 'Servidor mysql utilizable'
 	],
 	'diskquota' => 'Cuota',
-	'dkim' => [
-		'dkim_prefix' => [
-			'title' => 'Prefijo',
-			'description' => 'Especifique la ruta a los archivos DKIM RSA y a los archivos de configuración del plugin Milter'
-		],
-		'dkim_domains' => [
-			'title' => 'Nombre de archivo de los dominios',
-			'description' => '<em>Nombre de</em> archivo del parámetro DKIM Domains especificado en la configuración de dkim-milter'
-		],
-		'dkim_dkimkeys' => [
-			'title' => 'KeyList filename',
-			'description' => '<em>Nombre</em> de archivo del parámetro DKIM KeyList especificado en la configuración de dkim-milter'
-		],
-		'dkimrestart_command' => [
-			'title' => 'Comando de reinicio del filtro',
-			'description' => 'Especifique el comando de reinicio del servicio DKIM milter'
-		],
-		'privkeysuffix' => [
-			'title' => 'Sufijo de claves privadas',
-			'description' => 'Puede especificar una extensión/sufijo de nombre de archivo (opcional) para las claves privadas dkim generadas. Algunos servicios como dkim-filter requieren que esté vacío.'
-		],
-		'use_dkim' => [
-			'title' => '¿Activar soporte DKIM?',
-			'description' => '¿Desea utilizar el sistema de claves de dominio (DKIM)?<br/><em class="text-danger">Nota: DKIM sólo es compatible con dkim-filter, no con opendkim (todavía)</em>'
-		],
-		'dkim_algorithm' => [
-			'title' => 'Algoritmos Hash permitidos',
-			'description' => 'Defina los algoritmos hash permitidos, elija "Todos" para todos los algoritmos o uno o más de los otros algoritmos disponibles'
-		],
-		'dkim_servicetype' => 'Tipos de servicio',
-		'dkim_keylength' => [
-			'title' => 'Longitud de clave',
-			'description' => 'Atención: Si cambia estos valores, deberá eliminar todas las claves privadas/públicas de "%s".'
-		],
-		'dkim_notes' => [
-			'title' => 'Notas DKIM',
-			'description' => 'Notas que podrían ser de interés para un humano, por ejemplo, una URL como http://www.dnswatch.info. Ningún programa realiza ninguna interpretación. Esta etiqueta debe utilizarse con moderación debido a las limitaciones de espacio en DNS. Está pensada para que la utilicen los administradores, no los usuarios finales.'
-		]
-	],
 	'dns' => [
 		'destinationip' => 'IP(s) del dominio',
 		'standardip' => 'IP estándar del servidor',

lng/it.lng.php

@@ -660,41 +660,6 @@ return [
 		'services' => 'Servizi',
 	],
 	'diskquota' => 'Quota',
-	'dkim' => [
-		'dkim_prefix' => [
-			'title' => 'Prefisso',
-			'description' => 'Si prega di specificare il percorso della DKIM RSA-files, nonch¸ i file di configurazione per il plugin Milter',
-		],
-		'dkim_domains' => [
-			'title' => 'Domini nomefile',
-			'description' => '<em>Nome file</em> del parametro DKIM Domains specificata nella configurazione dkim-milter',
-		],
-		'dkim_dkimkeys' => [
-			'title' => 'Nome file del KeyList',
-			'description' => '<em>Nome file</em> del parametro DKIM KeyList specificata nella configurazione dkim-milter',
-		],
-		'dkimrestart_command' => [
-			'title' => 'Milter commando riavvio',
-			'description' => 'Si prega di specificare il comando per riavviare il servizio DKIM milter',
-		],
-		'use_dkim' => [
-			'title' => 'Attivare il supporto DKIM?',
-			'description' => 'Vuoi utilizzare il sistema Domain Keys (DKIM)?',
-		],
-		'dkim_algorithm' => [
-			'title' => 'Ammessi Algoritmi Hash',
-			'description' => 'Definire gli algoritmi di hash permessi, scegliere "Tutti" per permettere tutti gli algoritmi oppure uno o più tra gli altri algoritmi disponibili',
-		],
-		'dkim_servicetype' => 'Tipi di Servizio',
-		'dkim_keylength' => [
-			'title' => 'Lunghezza Chiave',
-			'description' => 'Attenzione: Se si modifica questo valore è necessario eliminare tutte le chiavi private/pubbliche in "%s"',
-		],
-		'dkim_notes' => [
-			'title' => 'Note DKIM',
-			'description' => 'Nota potrebbe essere di interesse, es. un URL come http://www.dnswatch.info. Nessuna interpretazione è fatta da nessun programma. Questo tag deve essere usato con parsimonia per ragioni di spazio nel DNS. Questo è destinato ad essere utilizzato dagli amministratori e non dagli utenti finali.',
-		],
-	],
 	'dns' => [
 		'destinationip' => 'Dominio IP',
 		'a_record' => 'A-Record (IPv6 optionale)',

lng/nl.lng.php

@@ -328,41 +328,6 @@ return [
 		'mail_quota' => 'Mailquotum',
 		'sendinfomail' => 'Stuur gegevens naar mij via e-mail',
 	],
-	'dkim' => [
-		'dkim_prefix' => [
-			'title' => 'Prefix',
-			'description' => 'Geef het pad naar de DKIM RSA-files alsook naar de configuratie van de Milter-plugin',
-		],
-		'dkim_domains' => [
-			'title' => 'Bestandsnaam domeinen',
-			'description' => '<em>Bestandsnaam</em> van het DKIM Domains-parameter zoals aangegeven in de configuratie van dkim-milter',
-		],
-		'dkim_dkimkeys' => [
-			'title' => 'KeyList filename',
-			'description' => '<em>Bestandsnaam</em> van het DKIM KeyList-parameter zoals aangegeven in de configuratie van dkim-milter',
-		],
-		'dkimrestart_command' => [
-			'title' => 'Herstart-commando voor Milter',
-			'description' => 'Geef het commando om de milter-plugin te herstarten',
-		],
-		'use_dkim' => [
-			'title' => 'Activeer ondersteuning voor DKIM?',
-			'description' => 'Wilt u gebruikmaken van Domain Keys (DKIM) systeem?',
-		],
-		'dkim_algorithm' => [
-			'title' => 'Toegestane hash-algoritmen',
-			'description' => 'Toegestane hash-algoritmen, kies "Alle" voor alle algoritmen of 1 of meerdere van onderstaande',
-		],
-		'dkim_servicetype' => 'Type services',
-		'dkim_keylength' => [
-			'title' => 'Lengte sleutel',
-			'description' => 'Let op: Indien u deze waarde wijzigt, dient u allen geheime en publieke sleutels in "%s" te verwijderen',
-		],
-		'dkim_notes' => [
-			'title' => 'Notities voor DKIM',
-			'description' => 'Notities die van belang kunnen zijn voor mensen, bijvoorbeeld een URL als http://www.dnswatch.info. Geen enkel programma zal deze informatie verwerken. Deze informatie dient schaars te zijn gezien de beperkte ruimte in DNS. Dit is bedoeld voor beheerders, niet voor eindgebruikers.',
-		],
-	],
 	'dns' => [
 		'destinationip' => 'IP domein',
 		'standardip' => 'Standaard server IP',