From f7f6584e3a903d3429da306d2de3c9ede88178ac Mon Sep 17 00:00:00 2001 From: Dirk Weise Date: Tue, 22 Jan 2019 14:27:33 +0100 Subject: [PATCH 1/5] Fix german lang glitch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is no adjective "klartext". 🤓 ![grammar police](https://i.imgflip.com/1j57fn.jpg) --- data/web/lang/lang.de.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/lang/lang.de.php b/data/web/lang/lang.de.php index 3e253069..3116434d 100644 --- a/data/web/lang/lang.de.php +++ b/data/web/lang/lang.de.php @@ -589,10 +589,10 @@ $lang['admin']['transports_hint'] = 'Transport Maps überwiegen senderabh Ein Eintrag in der TLS Policy Map kann eine Verschlüsselung erzwingen.
Die Authentifizierung wird anhand des Host Parameters ermittelt, hierbei würde bei einem beispielhaften Next Hop "[host]:25" immer zuerst "host" abfragt und erst im Anschluss "[host]:25".
Dieses Verhalten schließt die gleichzeitige Verwendung von Einträgen der Art "host" sowie "[host]:25" aus.'; -$lang['admin']['add_relayhost_hint'] = 'Bitte beachten Sie, dass Anmeldedaten klartext gespeichert werden.
+$lang['admin']['add_relayhost_hint'] = 'Bitte beachten Sie, dass Anmeldedaten unverschlüsselt gespeichert werden.
Angelegte Transporte dieser Art sind senderabhängig und müssen erst einer Domain zugewiesen werden, bevor sie als Transport verwendet werden.
Diese Einstellungen entsprechen demach nicht dem "relayhost" Parameter in Postfix.'; -$lang['admin']['add_transports_hint'] = 'Bitte beachten Sie, dass Anmeldedaten klartext gespeichert werden.'; +$lang['admin']['add_transports_hint'] = 'Bitte beachten Sie, dass Anmeldedaten unverschlüsselt gespeichert werden.'; $lang['admin']['host'] = 'Host'; $lang['admin']['source'] = 'Quelle'; $lang['admin']['add_forwarding_host'] = 'Weiterleitungs-Host hinzufügen'; From 6b89927f6e5b61831d00768d3a75687aa270d2f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Wed, 23 Jan 2019 10:29:58 +0100 Subject: [PATCH 2/5] [Web] Lower compose project name, fixes #1994 --- data/web/inc/functions.docker.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/web/inc/functions.docker.inc.php b/data/web/inc/functions.docker.inc.php index 9c63eec7..211a87fb 100644 --- a/data/web/inc/functions.docker.inc.php +++ b/data/web/inc/functions.docker.inc.php @@ -33,7 +33,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex if (!empty($containers)) { foreach ($containers as $container) { if ($container['Config']['Labels']['com.docker.compose.service'] == $service_name - && $container['Config']['Labels']['com.docker.compose.project'] == getenv('COMPOSE_PROJECT_NAME')) { + && $container['Config']['Labels']['com.docker.compose.project'] == strtolower(getenv('COMPOSE_PROJECT_NAME'))) { return trim($container['Id']); } } @@ -65,7 +65,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex $containers = json_decode($response, true); if (!empty($containers)) { foreach ($containers as $container) { - if ($container['Config']['Labels']['com.docker.compose.project'] == getenv('COMPOSE_PROJECT_NAME')) { + if ($container['Config']['Labels']['com.docker.compose.project'] == strtolower(getenv('COMPOSE_PROJECT_NAME'))) { $out[$container['Config']['Labels']['com.docker.compose.service']]['State'] = $container['State']; $out[$container['Config']['Labels']['com.docker.compose.service']]['Config'] = $container['Config']; } @@ -120,7 +120,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex if (!empty($decoded_response)) { if (empty($service_name)) { foreach ($decoded_response as $container) { - if ($container['Config']['Labels']['com.docker.compose.project'] == getenv('COMPOSE_PROJECT_NAME')) { + if ($container['Config']['Labels']['com.docker.compose.project'] == strtolower(getenv('COMPOSE_PROJECT_NAME'))) { unset($container['Config']['Env']); $out[$container['Config']['Labels']['com.docker.compose.service']]['State'] = $container['State']; $out[$container['Config']['Labels']['com.docker.compose.service']]['Config'] = $container['Config']; @@ -128,7 +128,7 @@ function docker($action, $service_name = null, $attr1 = null, $attr2 = null, $ex } } else { - if ($decoded_response['Config']['Labels']['com.docker.compose.project'] == getenv('COMPOSE_PROJECT_NAME')) { + if ($decoded_response['Config']['Labels']['com.docker.compose.project'] == strtolower(getenv('COMPOSE_PROJECT_NAME'))) { unset($container['Config']['Env']); $out[$decoded_response['Config']['Labels']['com.docker.compose.service']]['State'] = $decoded_response['State']; $out[$decoded_response['Config']['Labels']['com.docker.compose.service']]['Config'] = $decoded_response['Config']; From 83c7d9014d06b3c62131d54f7f9366b3e1b57d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 24 Jan 2019 19:33:13 +0100 Subject: [PATCH 3/5] replace hard coded solr dns with dynamic variable --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 5c3c2b99..1976b7fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -399,7 +399,7 @@ services: volumes: - solr-vol-1:/opt/solr/server/solr/dovecot/data dns: - - 172.22.1.254 + - ${IPV4_NETWORK:-172.22.1}.254 dns_search: mailcow-network environment: - SOLR_HEAP=${SOLR_HEAP:-1024} From 66b9beae433654c90ba945dcf59c89c22fd24e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20M=C3=BCller?= Date: Thu, 24 Jan 2019 20:43:19 +0100 Subject: [PATCH 4/5] remove dns-search property --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1976b7fe..4b2108ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -400,7 +400,6 @@ services: - solr-vol-1:/opt/solr/server/solr/dovecot/data dns: - ${IPV4_NETWORK:-172.22.1}.254 - dns_search: mailcow-network environment: - SOLR_HEAP=${SOLR_HEAP:-1024} - SKIP_SOLR=${SKIP_SOLR:-y} From 40061ff6afb147c0b50ed507496e1b69dd2c6ea8 Mon Sep 17 00:00:00 2001 From: Tii Date: Wed, 30 Jan 2019 00:16:30 +0100 Subject: [PATCH 5/5] Don't check for firefox, only check for u2f browser API --- data/web/js/u2f-api.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/web/js/u2f-api.js b/data/web/js/u2f-api.js index 37afaa0e..e8e653bf 100644 --- a/data/web/js/u2f-api.js +++ b/data/web/js/u2f-api.js @@ -20,10 +20,9 @@ * Modification: * Only continue load this library if window.u2f is not already supplied by the browser. */ - var isFirefox = navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Gecko/') !== -1; var browserImplementsU2f = !!((typeof root.u2f !== 'undefined') && root.u2f.register); - if (isFirefox && browserImplementsU2f) { + if (browserImplementsU2f) { root.u2f.isSupported = true; return; }