From 040e1edb6a854f963e2e23c5c07f097c82c6dc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=A4ufl?= Date: Tue, 7 Mar 2017 15:35:17 +0100 Subject: [PATCH 1/4] [docs] Removed left over from merge conflict Ref 5c40d84e78d23e69c92957be5c267a2ffaeb724e --- docs/u_and_e.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/u_and_e.md b/docs/u_and_e.md index 2470cd14..fe4a3913 100644 --- a/docs/u_and_e.md +++ b/docs/u_and_e.md @@ -52,8 +52,7 @@ curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose versio Edit a domain as (domain) administrator to add an item to the filter table. Beware that a mailbox user can login to mailcow and override a domain policy filter item. -<<<<<<< HEAD - + ## Change default language Change `data/conf/sogo/sogo.conf` and replace "English" by your prefered language. From 3aeed95bacc0c917f5654f0c8299e073fe969854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=A4ufl?= Date: Tue, 7 Mar 2017 15:38:42 +0100 Subject: [PATCH 2/4] [docs] Fixed typos --- docs/u_and_e.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/u_and_e.md b/docs/u_and_e.md index fe4a3913..bcb47517 100644 --- a/docs/u_and_e.md +++ b/docs/u_and_e.md @@ -55,7 +55,7 @@ Beware that a mailbox user can login to mailcow and override a domain policy fil ## Change default language -Change `data/conf/sogo/sogo.conf` and replace "English" by your prefered language. +Change `data/conf/sogo/sogo.conf` and replace "English" by your preferred language. Create a file `data/web/inc/vars.local.inc.php` and add "DEFAULT_LANG" with either "en", "pt", "de" or "nl": ``` @@ -381,13 +381,13 @@ Mailbox users can tag their mail address like in `me+facebook@example.org` and c ## Two-factor authentication -So far two methods for TFA are impelemented. Both work with the fantastic [Yubikey](https://www.yubico.com). +So far two methods for TFA are implemented. Both work with the fantastic [Yubikey](https://www.yubico.com). While Yubi OTP needs an active internet connection and an API ID and key, U2F will work with any FIDO U2F USB key out of the box, but can only be used when mailcow is accessed over HTTPS. -Both methods support mulitple YubiKeys. +Both methods support multiple YubiKeys. -As administrator you are able to temporary disable a domain adminsitrators TFA login until they successfully logged in. +As administrator you are able to temporary disable a domain administrators TFA login until they successfully logged in. The key used to login will be displayed in green, while other keys remain grey. From 9762176810f4f6f932815beccdc85e2068522aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=A4ufl?= Date: Tue, 7 Mar 2017 15:40:23 +0100 Subject: [PATCH 3/4] [Dockerfiles] From -> FROM --- data/Dockerfiles/dovecot/Dockerfile | 2 +- data/Dockerfiles/postfix/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/Dockerfiles/dovecot/Dockerfile b/data/Dockerfiles/dovecot/Dockerfile index b98cd908..abd07c1f 100644 --- a/data/Dockerfiles/dovecot/Dockerfile +++ b/data/Dockerfiles/dovecot/Dockerfile @@ -1,4 +1,4 @@ -From ubuntu:xenial +FROM ubuntu:xenial MAINTAINER Andre Peters ENV DEBIAN_FRONTEND noninteractive diff --git a/data/Dockerfiles/postfix/Dockerfile b/data/Dockerfiles/postfix/Dockerfile index a3781bd4..6a36f443 100644 --- a/data/Dockerfiles/postfix/Dockerfile +++ b/data/Dockerfiles/postfix/Dockerfile @@ -1,4 +1,4 @@ -From ubuntu:xenial +FROM ubuntu:xenial MAINTAINER Andre Peters ENV DEBIAN_FRONTEND noninteractive From a06bac673948d3911e9c81e562c321357bce333f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20K=C3=A4ufl?= Date: Tue, 7 Mar 2017 15:44:37 +0100 Subject: [PATCH 4/4] [Dockerfiles] Use COPY instead of ADD --- data/Dockerfiles/clamav/Dockerfile | 2 +- data/Dockerfiles/rspamd/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/Dockerfiles/clamav/Dockerfile b/data/Dockerfiles/clamav/Dockerfile index 40954bc7..5fc44d9a 100755 --- a/data/Dockerfiles/clamav/Dockerfile +++ b/data/Dockerfiles/clamav/Dockerfile @@ -40,5 +40,5 @@ VOLUME ["/var/lib/clamav"] EXPOSE 3310 # av daemon bootstrapping -ADD bootstrap.sh / +COPY bootstrap.sh / CMD ["/bootstrap.sh"] diff --git a/data/Dockerfiles/rspamd/Dockerfile b/data/Dockerfiles/rspamd/Dockerfile index d2722004..70a0bbab 100644 --- a/data/Dockerfiles/rspamd/Dockerfile +++ b/data/Dockerfiles/rspamd/Dockerfile @@ -16,8 +16,8 @@ RUN apt-key adv --fetch-keys http://rspamd.com/apt-stable/gpg.key \ RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local -ADD settings.conf /etc/rspamd/modules.d/settings.conf -ADD antivirus.conf /etc/rspamd/modules.d/antivirus.conf +COPY settings.conf /etc/rspamd/modules.d/settings.conf +COPY antivirus.conf /etc/rspamd/modules.d/antivirus.conf RUN pip install -U oletools