paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104 from michael-k/fixes 

Fixes in docs and Dockerfiles
master
André Peters 2017-03-07 16:07:49 +01:00 committed by GitHub
parent 5c40d84e78 a06bac6739
commit 91bc1d6986
5 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/Dockerfiles/clamav/Dockerfile
View File

@ -40,5 +40,5 @@ VOLUME ["/var/lib/clamav"]
EXPOSE 3310 EXPOSE 3310
# av daemon bootstrapping # av daemon bootstrapping
ADD bootstrap.sh / COPY bootstrap.sh /
CMD ["/bootstrap.sh"] CMD ["/bootstrap.sh"]

2
data/Dockerfiles/dovecot/Dockerfile
View File

@ -1,4 +1,4 @@
From ubuntu:xenial FROM ubuntu:xenial
MAINTAINER Andre Peters <andre.peters@servercow.de> MAINTAINER Andre Peters <andre.peters@servercow.de>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

2
data/Dockerfiles/postfix/Dockerfile
View File

@ -1,4 +1,4 @@
From ubuntu:xenial FROM ubuntu:xenial
MAINTAINER Andre Peters <andre.peters@servercow.de> MAINTAINER Andre Peters <andre.peters@servercow.de>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive

4
data/Dockerfiles/rspamd/Dockerfile
View File

@ -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 RUN echo '.include $LOCAL_CONFDIR/local.d/rspamd.conf.local' > /etc/rspamd/rspamd.conf.local
ADD settings.conf /etc/rspamd/modules.d/settings.conf COPY settings.conf /etc/rspamd/modules.d/settings.conf
ADD antivirus.conf /etc/rspamd/modules.d/antivirus.conf COPY antivirus.conf /etc/rspamd/modules.d/antivirus.conf
RUN pip install -U oletools RUN pip install -U oletools

9
docs/u_and_e.md
View File

@ -52,11 +52,10 @@ 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. 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. Beware that a mailbox user can login to mailcow and override a domain policy filter item.
<<<<<<< HEAD
## Change default language ## 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": Create a file `data/web/inc/vars.local.inc.php` and add "DEFAULT_LANG" with either "en", "pt", "de" or "nl":
``` ```
@ -382,13 +381,13 @@ Mailbox users can tag their mail address like in `me+facebook@example.org` and c
## Two-factor authentication ## 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. 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. The key used to login will be displayed in green, while other keys remain grey.