Bläddra i källkod

Merge branch 'master' of https://github.com/mailcow/mailcow-dockerized

andryyy 5 år sedan
förälder
incheckning
9a25ebc54e
3 ändrade filer med 16 tillägg och 5 borttagningar
  1. 13 3
      README.md
  2. 2 1
      data/Dockerfiles/acme/reload-configurations.sh
  3. 1 1
      docker-compose.yml

+ 13 - 3
README.md

@@ -2,13 +2,23 @@
 
 ## Want to support mailcow?
 
-Please [consider a support contract (around 30 € per month) with Servercow](https://www.servercow.de/mailcow#support) to support further development. _We_ support _you_ while _you_ support _us_. :)
+Please [consider a support contract with Servercow](https://www.servercow.de/mailcow?lang=en#support) to support further development. _We_ support _you_ while _you_ support _us_. :)
+
+You can also [get a SAL](https://www.servercow.de/mailcow?lang=en#sal) which is a one-time payment with no liabilities or returning fees.
 
 Or just spread the word: moo.
 
-## Info and documentation
+## Info, documentation and support
+
+Please see [the official documentation](https://mailcow.github.io/mailcow-dockerized-docs/) for installation and support instructions. 🐄
 
-Please see [the official documentation](https://mailcow.github.io/mailcow-dockerized-docs/) for instructions.
+🐛 **If you found a critical security issue or simply want to report a bug, please mail us to [info at servercow.de](mailto:info@servercow.de).**
 
 **Important**: mailcow makes use of various open-source software. Please assure you agree with their license before using mailcow.
 Any part of mailcow itself is released under **GNU General Public License, Version 3**.
+
+## Want to chat?
+
+[Telegram mailcow channel](https://telegram.me/mailcow)
+
+[Telegram mailcow Off-Topic channel](https://t.me/mailcowOfftopic)

+ 2 - 1
data/Dockerfiles/acme/reload-configurations.sh

@@ -38,7 +38,8 @@ if [[ "${CERT_AMOUNT_CHANGED}" == "1" ]]; then
   restart_container ${POSTFIX}
 else
   reload_nginx
-  reload_dovecot
+  #reload_dovecot
+  restart_container ${DOVECOT}
   #reload_postfix
   restart_container ${POSTFIX}
 fi

+ 1 - 1
docker-compose.yml

@@ -333,7 +333,7 @@ services:
     acme-mailcow:
       depends_on:
         - nginx-mailcow
-      image: mailcow/acme:1.66
+      image: mailcow/acme:1.67
       dns:
         - ${IPV4_NETWORK:-172.22.1}.254
       environment: