From 4c98cbec27f17b05d81e7ff3a8835789e2b02a86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Sun, 19 Nov 2017 18:44:18 +0100 Subject: [PATCH 1/7] Exclude 172.22.1.1 from mynetworks In case of v6 nat failures. --- data/conf/postfix/main.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf index edf5c6d5..15580ad4 100644 --- a/data/conf/postfix/main.cf +++ b/data/conf/postfix/main.cf @@ -9,7 +9,7 @@ smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_una alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases relayhost = -mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 [fd4d:6169:6c63:6f77::]/64 +mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 [fd4d:6169:6c63:6f77::]/64 !172.22.1.1 mailbox_size_limit = 0 recipient_delimiter = + inet_interfaces = all From 501731e7b9fe701f0d3bb0df980233dfbd8a6a3e Mon Sep 17 00:00:00 2001 From: maffo999 Date: Thu, 23 Nov 2017 10:02:25 +0100 Subject: [PATCH 2/7] Update update.sh fixed a typo on line 82 --- update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update.sh b/update.sh index 461b2a2a..8f254c3b 100755 --- a/update.sh +++ b/update.sh @@ -79,7 +79,7 @@ else exit 1 fi -read -r -p "Are you sure you want to update mailcow: dockerized? All containers will be stoped. [y/N] " response +read -r -p "Are you sure you want to update mailcow: dockerized? All containers will be stopped. [y/N] " response if [[ ! "$response" =~ ^([yY][eE][sS]|[yY])+$ ]]; then echo "OK, exiting." exit 0 From b1986e5f7cc2a47108e42be2d75609d68fa6b6ec Mon Sep 17 00:00:00 2001 From: Hagen Tasche Date: Thu, 30 Nov 2017 14:01:46 +0100 Subject: [PATCH 3/7] Update lang.en.php Translation from german to english --- data/web/lang/lang.en.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index 6b404862..95516286 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -174,8 +174,8 @@ $lang['user']['tag_handling'] = 'Set handling for tagged mail'; $lang['user']['tag_in_subfolder'] = 'In subfolder'; $lang['user']['tag_in_subject'] = 'In subject'; $lang['user']['tag_help_explain'] = 'In subfolder: a new subfolder named after the tag will be created below INBOX ("INBOX/Facebook").
-In subject: the tags name will be prepended to the mails subject, example: "[Facebook] Meine Neuigkeiten".'; -$lang['user']['tag_help_example'] = 'Example for a tagged email address: ich+Facebook@example.org'; +In subject: the tags name will be prepended to the mails subject, example: "[Facebook] My News".'; +$lang['user']['tag_help_example'] = 'Example for a tagged email address: me+Facebook@example.org'; $lang['user']['eas_reset'] = 'Reset ActiveSync device cache'; $lang['user']['eas_reset_now'] = 'Reset now'; $lang['user']['eas_reset_help'] = 'In many cases a device cache reset will help to recover a broken ActiveSync profile.
Attention: All elements will be redownloaded!'; From b3e7a7ef14a7c53e41539c47165aef2ba1e3a4e0 Mon Sep 17 00:00:00 2001 From: Michael Kuron Date: Mon, 4 Dec 2017 19:58:02 +0100 Subject: [PATCH 4/7] Disable MariaDB health check --- docker-compose.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index cc97cbce..be6754fe 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,9 +5,6 @@ services: image: mailcow/unbound:1.0 build: ./data/Dockerfiles/unbound command: /usr/sbin/unbound - depends_on: - mysql-mailcow: - condition: service_healthy volumes: - ./data/conf/unbound/unbound.conf:/etc/unbound/unbound.conf:ro restart: always @@ -20,11 +17,6 @@ services: mysql-mailcow: image: mariadb:10.2 command: mysqld --max_allowed_packet=192M --max-connections=1500 --innodb-strict-mode=0 --skip-host-cache --skip-name-resolve --log-warnings=0 - healthcheck: - test: ["CMD", "mysqladmin", "-u$DBUSER", "-p$DBPASS", "ping", "-h", "localhost"] - interval: 5s - timeout: 5s - retries: 10 volumes: - mysql-vol-1:/var/lib/mysql/ - ./data/conf/mysql/:/etc/mysql/conf.d/:ro From 9c35a55532e80ab6bafa64bd385d42b5a7dddeae Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Tue, 5 Dec 2017 10:18:29 +0800 Subject: [PATCH 5/7] fixes #800 corrections will be made for other languages soon --- data/web/lang/lang.en.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/lang/lang.en.php b/data/web/lang/lang.en.php index 95516286..f99458e9 100644 --- a/data/web/lang/lang.en.php +++ b/data/web/lang/lang.en.php @@ -562,7 +562,7 @@ $lang['admin']['link'] = "Link"; $lang['admin']['remove_row'] = "Remove row"; $lang['admin']['add_row'] = "Add row"; $lang['admin']['reset_default'] = "Reset to default"; -$lang['admin']['merged_vars_hint'] = 'Greyed out rows were merged from vars.inc.(local.)php and cannot be modified.'; +$lang['admin']['merged_vars_hint'] = 'Greyed out rows were merged from vars.(local.)inc.php and cannot be modified.'; $lang['mailbox']['waiting'] = "Waiting"; $lang['mailbox']['status'] = "Status"; $lang['mailbox']['running'] = "Running"; From b1855587ec9076c8660e87b58db700cda07b6dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Peters?= Date: Tue, 5 Dec 2017 20:53:45 +0100 Subject: [PATCH 6/7] Revert exclude, bad idea --- data/conf/postfix/main.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/conf/postfix/main.cf b/data/conf/postfix/main.cf index 15580ad4..edf5c6d5 100644 --- a/data/conf/postfix/main.cf +++ b/data/conf/postfix/main.cf @@ -9,7 +9,7 @@ smtpd_relay_restrictions = permit_mynetworks permit_sasl_authenticated defer_una alias_maps = hash:/etc/aliases alias_database = hash:/etc/aliases relayhost = -mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 [fd4d:6169:6c63:6f77::]/64 !172.22.1.1 +mynetworks = 127.0.0.0/8 [::ffff:127.0.0.0]/104 [::1]/128 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16 [fd4d:6169:6c63:6f77::]/64 mailbox_size_limit = 0 recipient_delimiter = + inet_interfaces = all From 91ccc470247682f2a596a0cdc07843576b1122e6 Mon Sep 17 00:00:00 2001 From: Phoenix Eve Aspacio Date: Fri, 12 Jan 2018 06:20:27 +0800 Subject: [PATCH 7/7] Make Capitalization Consistent Some ~poorly~ configured reverse proxy interfaces are not specifically configured to respond appropriately with a lowercase "A" in the autodiscover url. So our best course is to make the capitalization consistent with the one we are used to. --- data/web/autodiscover-json.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/web/autodiscover-json.php b/data/web/autodiscover-json.php index decfe3c3..56878838 100644 --- a/data/web/autodiscover-json.php +++ b/data/web/autodiscover-json.php @@ -12,7 +12,7 @@ if ($_GET['Protocol'] == 'ActiveSync') { echo '{"Protocol":"ActiveSync","Url":"' . $autodiscover_config['activesync']['url'] . '"}'; } elseif ($_GET['Protocol'] == 'AutodiscoverV1') { - echo '{"Protocol":"AutodiscoverV1","Url":"https://' . $_SERVER['HTTP_HOST'] . '/autodiscover/autodiscover.xml"}'; + echo '{"Protocol":"AutodiscoverV1","Url":"https://' . $_SERVER['HTTP_HOST'] . '/Autodiscover/Autodiscover.xml"}'; } else { http_response_code(400);