Remove duplicate, fix whitespace & formatting (#578)
* Remove duplicate/remnant * Whitespace & formatting
Dieser Commit ist enthalten in:
Ursprung
e4bad57db7
Commit
08d8bdb06d
2 geänderte Dateien mit 11 neuen und 14 gelöschten Zeilen
|
@ -109,6 +109,7 @@ Wenn redis-cli sich beschwert ĂĽber...
|
||||||
...das Schlüsselmuster nicht gefunden wurde und somit keine Daten zum Löschen vorhanden sind - ist es in Ordnung.
|
...das Schlüsselmuster nicht gefunden wurde und somit keine Daten zum Löschen vorhanden sind - ist es in Ordnung.
|
||||||
|
|
||||||
## CLI-Werkzeuge
|
## CLI-Werkzeuge
|
||||||
|
|
||||||
=== "docker compose (Plugin)"
|
=== "docker compose (Plugin)"
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
|
@ -233,6 +234,7 @@ GLOBAL_RCPT_BL {
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Speichern Sie die Datei und starten Sie Rspamd neu:
|
3. Speichern Sie die Datei und starten Sie Rspamd neu:
|
||||||
|
|
||||||
=== "docker compose (Plugin)"
|
=== "docker compose (Plugin)"
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
|
@ -355,7 +357,7 @@ Danach mĂĽssen Sie die Konfigurationsparameter des Modules in `data/conf/rspamd/
|
||||||
Falls das Modul `my_plugin.lua` heiĂźt, sollte die Datei wie folgt aussehen:
|
Falls das Modul `my_plugin.lua` heiĂźt, sollte die Datei wie folgt aussehen:
|
||||||
|
|
||||||
```
|
```
|
||||||
# rspamd.conf.local
|
# rspamd.conf.local
|
||||||
my_plugin {
|
my_plugin {
|
||||||
some_setting = "some value";
|
some_setting = "some value";
|
||||||
}
|
}
|
||||||
|
@ -364,13 +366,12 @@ my_plugin {
|
||||||
Falls Ihr Modul keine zusätzlichen Konfigurationen benötigt, reicht es aus einen leeren Konfigurationsblock hinzuzufügen. Wie im folgenden Beispiel zu sehen:
|
Falls Ihr Modul keine zusätzlichen Konfigurationen benötigt, reicht es aus einen leeren Konfigurationsblock hinzuzufügen. Wie im folgenden Beispiel zu sehen:
|
||||||
|
|
||||||
```
|
```
|
||||||
# rspamd.conf.local
|
# rspamd.conf.local
|
||||||
my_plugin { }
|
my_plugin { }
|
||||||
```
|
```
|
||||||
|
|
||||||
Falls Sie keinen Konfigurationsblock hinzufĂĽgen, dann wird das Modul automatisch deaktiviert und im Logfile des rspamd-mailcow Containers sehen Sie folgende Nachricht:
|
Falls Sie keinen Konfigurationsblock hinzufĂĽgen, dann wird das Modul automatisch deaktiviert und im Logfile des rspamd-mailcow Containers sehen Sie folgende Nachricht:
|
||||||
|
|
||||||
|
|
||||||
```
|
```
|
||||||
mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:01:32 #1(main) <sh6j9z>; cfg; rspamd_config_is_module_enabled: lua module my_plugin is enabled but has not been configured
|
mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:01:32 #1(main) <sh6j9z>; cfg; rspamd_config_is_module_enabled: lua module my_plugin is enabled but has not been configured
|
||||||
mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:01:32 #1(main) <sh6j9z>; cfg; rspamd_config_is_module_enabled: my_plugin disabling unconfigured lua module
|
mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:01:32 #1(main) <sh6j9z>; cfg; rspamd_config_is_module_enabled: my_plugin disabling unconfigured lua module
|
||||||
|
@ -379,4 +380,5 @@ mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:01:32 #1(main) <sh6j9z>; cfg
|
||||||
Falls Sie das Modul erfolgreich konfiguiert haben, dann sollte das Logfile des rspamd-mailcow Containers wie folgt aussehen:
|
Falls Sie das Modul erfolgreich konfiguiert haben, dann sollte das Logfile des rspamd-mailcow Containers wie folgt aussehen:
|
||||||
|
|
||||||
```
|
```
|
||||||
mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:04:50 #1(main) <8ayxpf>; cfg; rspamd_init_lua_filters: init lua module my_plugin from /etc/rspamd/plugins.d//my_plugin.lua; digest: 5cb88961e5
|
mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:04:50 #1(main) <8ayxpf>; cfg; rspamd_init_lua_filters: init lua module my_plugin from /etc/rspamd/plugins.d//my_plugin.lua; digest: 5cb88961e5
|
||||||
|
```
|
||||||
|
|
|
@ -108,8 +108,8 @@ If redis-cli complains about...
|
||||||
|
|
||||||
...the key pattern was not found and thus no data is available to delete - it is fine.
|
...the key pattern was not found and thus no data is available to delete - it is fine.
|
||||||
|
|
||||||
|
|
||||||
## CLI tools
|
## CLI tools
|
||||||
|
|
||||||
=== "docker compose (Plugin)"
|
=== "docker compose (Plugin)"
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
|
@ -194,12 +194,6 @@ To reset custom defined thresholds, run:
|
||||||
# or:
|
# or:
|
||||||
docker-compose exec mysql-mailcow mysql -umailcow -p$DBPASS mailcow -e "delete from filterconf where option = 'highspamlevel' or option = 'lowspamlevel' and object = 'only-this-mailbox@example.org';"
|
docker-compose exec mysql-mailcow mysql -umailcow -p$DBPASS mailcow -e "delete from filterconf where option = 'highspamlevel' or option = 'lowspamlevel' and object = 'only-this-mailbox@example.org';"
|
||||||
```
|
```
|
||||||
```
|
|
||||||
source mailcow.conf
|
|
||||||
docker compose exec mysql-mailcow mysql -umailcow -p$DBPASS mailcow -e "delete from filterconf where option = 'highspamlevel' or option = 'lowspamlevel';"
|
|
||||||
# or:
|
|
||||||
# docker compose exec mysql-mailcow mysql -umailcow -p$DBPASS mailcow -e "delete from filterconf where option = 'highspamlevel' or option = 'lowspamlevel' and object = 'only-this-mailbox@example.org';"
|
|
||||||
```
|
|
||||||
|
|
||||||
## Custom reject messages
|
## Custom reject messages
|
||||||
|
|
||||||
|
@ -240,6 +234,7 @@ GLOBAL_RCPT_BL {
|
||||||
```
|
```
|
||||||
|
|
||||||
3. Save the file and restart Rspamd:
|
3. Save the file and restart Rspamd:
|
||||||
|
|
||||||
=== "docker compose (Plugin)"
|
=== "docker compose (Plugin)"
|
||||||
|
|
||||||
``` bash
|
``` bash
|
||||||
|
@ -361,7 +356,7 @@ Next, add any necessary configuration for your module to `data/conf/rspamd/rspam
|
||||||
If you have a module named `my_plugin.lua`, configuration might look like the following:
|
If you have a module named `my_plugin.lua`, configuration might look like the following:
|
||||||
|
|
||||||
```
|
```
|
||||||
# rspamd.conf.local
|
# rspamd.conf.local
|
||||||
my_plugin {
|
my_plugin {
|
||||||
some_setting = "some value";
|
some_setting = "some value";
|
||||||
}
|
}
|
||||||
|
@ -370,7 +365,7 @@ my_plugin {
|
||||||
If your module does not require any additional configuration, simply add an empty configuration block, for example:
|
If your module does not require any additional configuration, simply add an empty configuration block, for example:
|
||||||
|
|
||||||
```
|
```
|
||||||
# rspamd.conf.local
|
# rspamd.conf.local
|
||||||
my_plugin { }
|
my_plugin { }
|
||||||
```
|
```
|
||||||
|
|
||||||
|
@ -385,4 +380,4 @@ If you have successfully configured your module, the rspamd-mailcow container lo
|
||||||
|
|
||||||
```
|
```
|
||||||
mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:04:50 #1(main) <8ayxpf>; cfg; rspamd_init_lua_filters: init lua module my_plugin from /etc/rspamd/plugins.d//my_plugin.lua; digest: 5cb88961e5
|
mailcowdockerized-rspamd-mailcow-1 | 2023-05-20 14:04:50 #1(main) <8ayxpf>; cfg; rspamd_init_lua_filters: init lua module my_plugin from /etc/rspamd/plugins.d//my_plugin.lua; digest: 5cb88961e5
|
||||||
```
|
```
|
||||||
|
|
Laden …
Tabelle hinzufĂĽgen
In neuem Issue referenzieren