From 65ce73f97344261a1f07e22b0f8cf215faa69cba Mon Sep 17 00:00:00 2001 From: andryyy Date: Thu, 3 Oct 2019 10:39:47 +0200 Subject: [PATCH] [Web] Remove mail address from examples of tls policy maps --- data/web/lang/lang.cs.php | 2 +- data/web/lang/lang.de.php | 2 +- data/web/lang/lang.en.php | 2 +- data/web/lang/lang.es.php | 2 +- data/web/lang/lang.nl.php | 2 +- data/web/output.html | 17516 ++++++++++++++++++++++++++++++++++++ docker-compose.yml | 2 +- 7 files changed, 17522 insertions(+), 6 deletions(-) create mode 100644 data/web/output.html diff --git a/data/web/lang/lang.cs.php b/data/web/lang/lang.cs.php index a09105348..ad532eaa7 100644 --- a/data/web/lang/lang.cs.php +++ b/data/web/lang/lang.cs.php @@ -279,7 +279,7 @@ $lang['mailbox']['tls_policy_maps_info'] = 'Tato mapa přepisuje pravidla odchoz $lang['mailbox']['tls_enforce_in'] = 'Vynutit TLS pro příchozí'; $lang['mailbox']['tls_enforce_out'] = 'Vynutit TLS pro odchozí'; $lang['mailbox']['tls_map_dest'] = 'Cíl'; -$lang['mailbox']['tls_map_dest_info'] = 'Příklady: example.org, .example.org, mail@example.org, [mail.example.org]:25'; +$lang['mailbox']['tls_map_dest_info'] = 'Příklady: example.org, .example.org, [mail.example.org]:25'; $lang['mailbox']['tls_map_policy'] = 'Pravidlo'; $lang['mailbox']['tls_map_parameters'] = 'Parametry'; $lang['mailbox']['tls_map_parameters_info'] = 'Prázdné nebo parametry, například: protocols=!SSLv2 ciphers=medium exclude=3DES'; diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php index ef1b682e5..dadfb8de4 100644 --- a/data/web/lang/lang.de.php +++ b/data/web/lang/lang.de.php @@ -272,7 +272,7 @@ $lang['mailbox']['tls_policy_maps_info'] = 'Nachstehende Richtlinien erzwingen T $lang['mailbox']['tls_enforce_in'] = 'TLS eingehend erzwingen'; $lang['mailbox']['tls_enforce_out'] = 'TLS ausgehend erzwingen'; $lang['mailbox']['tls_map_dest'] = 'Ziel'; -$lang['mailbox']['tls_map_dest_info'] = 'Beispiele: example.org, .example.org, mail@example.org, [mail.example.org]:25'; +$lang['mailbox']['tls_map_dest_info'] = 'Beispiele: example.org, .example.org, [mail.example.org]:25'; $lang['mailbox']['tls_map_policy'] = 'Richtlinie'; $lang['mailbox']['tls_map_parameters'] = 'Parameter'; $lang['mailbox']['tls_map_parameters_info'] = 'Leer oder Parameter, Beispiele: protocols=!SSLv2 ciphers=medium exclude=3DES'; diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index de5aaaef2..efdb80ee3 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -276,7 +276,7 @@ $lang['mailbox']['tls_policy_maps_info'] = 'This policy map overrides outgoing T $lang['mailbox']['tls_enforce_in'] = 'Enforce TLS incoming'; $lang['mailbox']['tls_enforce_out'] = 'Enforce TLS outgoing'; $lang['mailbox']['tls_map_dest'] = 'Destination'; -$lang['mailbox']['tls_map_dest_info'] = 'Examples: example.org, .example.org, mail@example.org, [mail.example.org]:25'; +$lang['mailbox']['tls_map_dest_info'] = 'Examples: example.org, .example.org, [mail.example.org]:25'; $lang['mailbox']['tls_map_policy'] = 'Policy'; $lang['mailbox']['tls_map_parameters'] = 'Parameters'; $lang['mailbox']['tls_map_parameters_info'] = 'Empty or parameters, for example: protocols=!SSLv2 ciphers=medium exclude=3DES'; diff --git a/data/web/lang/lang.es.php b/data/web/lang/lang.es.php index 4e3aafa96..d93c185f3 100644 --- a/data/web/lang/lang.es.php +++ b/data/web/lang/lang.es.php @@ -119,7 +119,7 @@ $lang['user']['tls_enforce_out'] = 'Aplicar TLS saliente'; $lang['mailbox']['tls_enforce_in'] = 'Aplicar TLS entrante'; $lang['mailbox']['tls_enforce_out'] = 'Aplicar TLS saliente'; $lang['mailbox']['tls_map_dest'] = 'Destino'; -$lang['mailbox']['tls_map_dest_info'] = 'Ejemplos: example.org, .example.org, mail@example.org, [mail.example.org]:25'; +$lang['mailbox']['tls_map_dest_info'] = 'Ejemplos: example.org, .example.org, [mail.example.org]:25'; $lang['mailbox']['tls_map_policy'] = 'Póliza'; $lang['mailbox']['tls_map_parameters'] = 'Parametros'; $lang['mailbox']['tls_map_parameters_info'] = 'Vacío o parametros, por ejemplo: protocols=!SSLv2 ciphers=medium exclude=3DES'; diff --git a/data/web/lang/lang.nl.php b/data/web/lang/lang.nl.php index b04e727ad..b0c361076 100644 --- a/data/web/lang/lang.nl.php +++ b/data/web/lang/lang.nl.php @@ -272,7 +272,7 @@ $lang['mailbox']['tls_policy_maps_info'] = 'Deze opties worden boven het versleu $lang['mailbox']['tls_enforce_in'] = 'Forceer inkomende versleuteling'; $lang['mailbox']['tls_enforce_out'] = 'Forceer uitgaande versleuteling'; $lang['mailbox']['tls_map_dest'] = 'Bestemming'; -$lang['mailbox']['tls_map_dest_info'] = 'Voorbeeld: example.org, .example.org, mail@example.org, [mail.example.org]:25'; +$lang['mailbox']['tls_map_dest_info'] = 'Voorbeeld: example.org, .example.org, [mail.example.org]:25'; $lang['mailbox']['tls_map_policy'] = 'Beleid'; $lang['mailbox']['tls_map_parameters'] = 'Parameters'; $lang['mailbox']['tls_map_parameters_info'] = 'Voorbeeld: protocols=!SSLv2 ciphers=medium exclude=3DES'; diff --git a/data/web/output.html b/data/web/output.html new file mode 100644 index 000000000..e8a042bf2 --- /dev/null +++ b/data/web/output.html @@ -0,0 +1,17516 @@ + + + + API + + + + + + + + + + + + + + + diff --git a/docker-compose.yml b/docker-compose.yml index f8c833c7f..9baa1d28c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -394,7 +394,7 @@ services: - watchdog dockerapi-mailcow: - image: mailcow/dockerapi:1.35 + image: mailcow/dockerapi:1.34 restart: always build: ./data/Dockerfiles/dockerapi oom_kill_disable: true