From 12294a6e5aa3c57c8c603d97a35fa443a962a8e2 Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Wed, 6 Jun 2018 18:40:51 +0000
Subject: [PATCH 01/53] Trying to enable fuzzy hashes for rspamd

---
 services/rspamd/Dockerfile                 |  5 +---
 services/rspamd/conf/fuzzy_check.conf      | 34 ++++++++++++++++++++++
 services/rspamd/conf/metrics.conf          | 19 ++++++++++++
 services/rspamd/conf/worker-controller.inc |  1 +
 services/rspamd/conf/worker-fuzzy.inc      |  5 ++++
 services/rspamd/conf/worker-normal.inc     |  1 +
 6 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 services/rspamd/conf/fuzzy_check.conf
 create mode 100644 services/rspamd/conf/metrics.conf
 create mode 100644 services/rspamd/conf/worker-fuzzy.inc

diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile
index c6c2afdd..1b8d7e6b 100644
--- a/services/rspamd/Dockerfile
+++ b/services/rspamd/Dockerfile
@@ -1,15 +1,12 @@
 FROM alpine:edge
 
-RUN apk add --no-cache python py-jinja2 rspamd rspamd-controller rspamd-proxy ca-certificates
+RUN apk add --no-cache python py-jinja2 rspamd rspamd-controller rspamd-proxy rspamd-fuzzy ca-certificates
 
 RUN mkdir /run/rspamd
 
 COPY conf/ /conf
 COPY start.py /start.py
 
-# Temporary fix to remove references to rspamd-fuzzy for now
-RUN sed -i '/fuzzy/,$d' /etc/rspamd/rspamd.conf
-
 EXPOSE 11332/tcp 11334/tcp
 
 CMD /start.py
diff --git a/services/rspamd/conf/fuzzy_check.conf b/services/rspamd/conf/fuzzy_check.conf
new file mode 100644
index 00000000..7c87e1c3
--- /dev/null
+++ b/services/rspamd/conf/fuzzy_check.conf
@@ -0,0 +1,34 @@
+rule "local" {
+    # Fuzzy storage server list
+    servers = "localhost:11335";
+    # Default symbol for unknown flags
+    symbol = "LOCAL_FUZZY_UNKNOWN";
+    # Additional mime types to store/check
+    mime_types = ["application/*"];
+    # Hash weight threshold for all maps
+    max_score = 20.0;
+    # Whether we can learn this storage
+    read_only = no;
+    # Ignore unknown flags
+    skip_unknown = yes;
+    # Hash generation algorithm
+    algorithm = "mumhash";
+
+    # Map flags to symbols
+    fuzzy_map = {
+        LOCAL_FUZZY_DENIED {
+            # Local threshold
+            max_score = 20.0;
+            # Flag to match
+            flag = 11;
+        }
+        LOCAL_FUZZY_PROB {
+            max_score = 10.0;
+            flag = 12;
+        }
+        LOCAL_FUZZY_WHITE {
+            max_score = 2.0;
+            flag = 13;
+        }
+    }
+}
diff --git a/services/rspamd/conf/metrics.conf b/services/rspamd/conf/metrics.conf
new file mode 100644
index 00000000..6a31964f
--- /dev/null
+++ b/services/rspamd/conf/metrics.conf
@@ -0,0 +1,19 @@
+group "fuzzy" {
+    max_score = 12.0;
+    symbol "LOCAL_FUZZY_UNKNOWN" {
+        weight = 5.0;
+        description = "Generic fuzzy hash match";
+    }
+    symbol "LOCAL_FUZZY_DENIED" {
+        weight = 12.0;
+        description = "Denied fuzzy hash";
+    }
+    symbol "LOCAL_FUZZY_PROB" {
+        weight = 5.0;
+        description = "Probable fuzzy hash";
+    }
+    symbol "LOCAL_FUZZY_WHITE" {
+        weight = -2.1;
+        description = "Whitelisted fuzzy hash";
+    }
+}
diff --git a/services/rspamd/conf/worker-controller.inc b/services/rspamd/conf/worker-controller.inc
index 6a020672..dd143942 100644
--- a/services/rspamd/conf/worker-controller.inc
+++ b/services/rspamd/conf/worker-controller.inc
@@ -1,3 +1,4 @@
+type = "controller";
 bind_socket = "*:11334";
 password = "mailu";
 secure_ip = "{{ FRONT_ADDRESS }}";
diff --git a/services/rspamd/conf/worker-fuzzy.inc b/services/rspamd/conf/worker-fuzzy.inc
new file mode 100644
index 00000000..a0021a03
--- /dev/null
+++ b/services/rspamd/conf/worker-fuzzy.inc
@@ -0,0 +1,5 @@
+type = "fuzzy";
+count = 1;
+backend = "redis";
+expire = 90d;
+allow_update = ["127.0.0.1"];
diff --git a/services/rspamd/conf/worker-normal.inc b/services/rspamd/conf/worker-normal.inc
index a6ee8317..ab996fb8 100644
--- a/services/rspamd/conf/worker-normal.inc
+++ b/services/rspamd/conf/worker-normal.inc
@@ -1 +1,2 @@
+type = "normal";
 enabled = false;

From 23e288aadcf7d5df941c8516fae9d0cbd6b1e054 Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Mon, 24 Sep 2018 17:29:31 +0000
Subject: [PATCH 02/53] Enabling swarm deployment on master branch: -Extends
 the usage of POD_ADDRESS_RANGE -Provides documentation

---
 core/dovecot/conf/dovecot.conf             |   2 +-
 core/postfix/conf/main.cf                  |   2 +-
 docs/swarm/master/README.md                | 349 +++++++++++++++++++++
 services/rspamd/conf/worker-controller.inc |   2 +-
 4 files changed, 352 insertions(+), 3 deletions(-)
 create mode 100644 docs/swarm/master/README.md

diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index a5973bf8..7cf10774 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -5,7 +5,7 @@ log_path = /dev/stderr
 protocols = imap pop3 lmtp sieve
 postmaster_address = {{ POSTMASTER }}@{{ DOMAIN }}
 hostname = {{ HOSTNAMES.split(",")[0] }}
-submission_host = {{ FRONT_ADDRESS }}
+submission_host = {{ FRONT_ADDRESS }} {{ POD_ADDRESS_RANGE }}
 
 service dict {
   unix_listener dict {
diff --git a/core/postfix/conf/main.cf b/core/postfix/conf/main.cf
index 2f2c6990..bde42dd1 100644
--- a/core/postfix/conf/main.cf
+++ b/core/postfix/conf/main.cf
@@ -32,7 +32,7 @@ relayhost = {{ RELAYHOST }}
 recipient_delimiter = {{ RECIPIENT_DELIMITER }}
 
 # Only the front server is allowed to perform xclient
-smtpd_authorized_xclient_hosts={{ FRONT_ADDRESS }}
+smtpd_authorized_xclient_hosts={{ FRONT_ADDRESS }} {{ POD_ADDRESS_RANGE }}
 
 ###############
 # TLS
diff --git a/docs/swarm/master/README.md b/docs/swarm/master/README.md
new file mode 100644
index 00000000..1406e05c
--- /dev/null
+++ b/docs/swarm/master/README.md
@@ -0,0 +1,349 @@
+# Install Mailu on a docker swarm
+
+## Prequisites
+
+### Swarm
+
+In order to deploy Mailu on a swarm, you will first need to initialize the swarm:
+
+The main command will be:
+```bash
+docker swarm init --advertise-addr <IP_ADDR>
+```
+See https://docs.docker.com/engine/swarm/swarm-tutorial/create-swarm/
+
+If you want to add other managers or workers, please use:
+```bash
+docker swarm join --token xxxxx 
+```
+See https://docs.docker.com/engine/swarm/join-nodes/
+
+You have now a working swarm, and you can check its status with:
+```bash
+core@coreos-01 ~/git/Mailu/docs/swarm/1.5 $ docker node ls
+ID                            HOSTNAME            STATUS              AVAILABILITY        MANAGER STATUS      ENGINE VERSION
+xhgeekkrlttpmtgmapt5hyxrb     black-pearl         Ready               Active                                  18.06.0-ce
+sczlqjgfhehsfdjhfhhph1nvb *   coreos-01           Ready               Active              Leader              18.03.1-ce
+mzrm9nbdggsfz4sgq6dhs5i6n     flying-dutchman     Ready               Active                                  18.06.0-ce
+```
+
+### Volume definition
+For data persistance (the Mailu services might be launched/relaunched on any of the swarm nodes), we need to have Mailu data stored in a manner accessible by every manager or worker in the swarm.
+Hereafter we will use a NFS share:
+```bash
+core@coreos-01 ~ $ showmount -e 192.168.0.30
+Export list for 192.168.0.30:
+/mnt/Pool1/pv            192.168.0.0
+```
+
+on the nfs server, I am using the following /etc/exports
+```bash
+$more /etc/exports
+/mnt/Pool1/pv -alldirs -mapall=root -network 192.168.0.0 -mask 255.255.255.0 
+```
+on the nfs server, I created the Mailu directory (in fact I copied a working Mailu set-up)
+```bash
+$mkdir /mnt/Pool1/pv/mailu
+```
+
+On your manager node, mount the nfs share to check that the share is available:
+```bash
+core@coreos-01 ~ $ sudo mount -t nfs 192.168.0.30:/mnt/Pool1/pv/mailu /mnt/local/
+```
+If this is ok, you can umount it:
+```bash
+core@coreos-01 ~ $ sudo umount /mnt/local/
+```
+
+
+### Networking mode
+On a swarm, the services are available (default mode) through a routing mesh managed by docker itself. With this mode, each service is given a virtual IP adress and docker manages the routing between this virtual IP and the container(s) providing this service. 
+
+In order to allow every (front & webmail) container to access the other services, we will use the variable POD_ADDRESS_RANGE.
+
+Let's create the mailu_default network:
+```bash
+core@coreos-01 ~ $ docker network create -d overlay --attachable mailu_default
+core@coreos-01 ~ $ docker network inspect mailu_default | grep Subnet
+                    "Subnet": "10.0.1.0/24",
+```
+In the docker-compose.yml file, we will then use POD_ADDRESS_RANGE = 10.0.1.0/24 
+
+Nota: on my setup, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of  "mailu_default-endpoint". So it might be sufficient to set POD_ADDRESS_RANGE to this specific ip (which can be found by inspecting mailu_default network)
+
+### Scalability
+- smtp and imap are scalable
+- front and webmail are scalable (pending POD_ADDRESS_RANGE is used), although the let's encrypt magic might not like it (race condidtion ? or risk to be banned by let's encrypt server if too many front containers attemps to renew the certs at the same time) 
+- redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file)
+
+### Variable substitution and docker-compose.yml
+The docker stack deploy command doesn't support variable substitution in the .yml file itself (but we still can use .env file to pass variables to the services). As a consequence we need to adjust the docker-compose file in order to :
+- remove all variables : $VERSION , $BIND_ADDRESS4 , $BIND_ADDRESS6 , $ANTIVIRUS , $WEBMAIL , etc
+- change the way we define the volumes (nfs share in our case)
+- add a deploy section for every service
+
+### Docker compose 
+An example of docker-compose-stack.yml file is available here:
+
+```yaml
+
+version: '3.2'
+
+services:
+
+  front:
+    image: mailu/nginx:master
+    restart: always
+    env_file: .env
+    ports:
+      - target: 80
+        published: 80
+      - target: 443
+        published: 443
+      - target: 110
+        published: 110
+      - target: 143
+        published: 143
+      - target: 993
+        published: 993
+      - target: 995
+        published: 995
+      - target: 25
+        published: 25
+      - target: 465
+        published: 465
+      - target: 587
+        published: 587
+    volumes:
+#      - "$ROOT/certs:/certs"
+      - type: volume
+        source: mailu_certs
+        target: /certs
+    deploy:
+      replicas: 2
+
+  redis:
+    image: redis:alpine
+    restart: always
+    volumes:
+#      - "$ROOT/redis:/data"
+      - type: volume
+        source: mailu_redis
+        target: /data
+    deploy:
+      replicas: 1
+
+  imap:
+    image: mailu/dovecot:master
+    restart: always
+    env_file: .env
+    environment:
+      - POD_ADDRESS_RANGE=10.0.1.0/24
+    volumes:
+#      - "$ROOT/data:/data"
+      - type: volume
+        source: mailu_data
+        target: /data
+#      - "$ROOT/mail:/mail"
+      - type: volume
+        source: mailu_mail
+        target: /mail
+#      - "$ROOT/overrides:/overrides"
+      - type: volume
+        source: mailu_overrides
+        target: /overrides
+    depends_on:
+      - front
+    deploy:
+      replicas: 2
+
+  smtp:
+    image: mailu/postfix:master
+    restart: always
+    env_file: .env
+    environment:
+      - POD_ADDRESS_RANGE=10.0.1.0/24
+    volumes:
+#      - "$ROOT/data:/data"
+      - type: volume
+        source: mailu_data
+        target: /data
+#      - "$ROOT/overrides:/overrides"
+      - type: volume
+        source: mailu_overrides
+        target: /overrides
+    depends_on:
+      - front
+    deploy:
+      replicas: 2
+
+  antispam:
+    image: mailu/rspamd:master
+    restart: always
+    env_file: .env
+    environment:
+      - POD_ADDRESS_RANGE=10.0.1.0/24
+    depends_on:
+      - front
+    volumes:
+#      - "$ROOT/filter:/var/lib/rspamd"
+      - type: volume
+        source: mailu_filter
+        target: /var/lib/rspamd
+#      - "$ROOT/dkim:/dkim"
+      - type: volume
+        source: mailu_dkim
+        target: /dkim
+#      - "$ROOT/overrides/rspamd:/etc/rspamd/override.d"
+      - type: volume
+        source: mailu_overrides_rspamd
+        target: /etc/rspamd/override.d
+    deploy:
+      replicas: 1
+
+  antivirus:
+    image: mailu/none:master
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/filter:/data"
+      - type: volume
+        source: mailu_filter
+        target: /data
+    deploy:
+      replicas: 1
+
+  webdav:
+    image: mailu/none:master
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/dav:/data"
+      - type: volume
+        source: mailu_dav
+        target: /data
+    deploy:
+      replicas: 1
+
+  admin:
+    image: mailu/admin:master
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/data:/data"
+      - type: volume
+        source: mailu_data
+        target: /data
+#      - "$ROOT/dkim:/dkim"
+      - type: volume
+        source: mailu_dkim
+        target: /dkim
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    depends_on:
+      - redis
+    deploy:
+      replicas: 1
+
+  webmail:
+    image: "mailu/roundcube:master"
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/webmail:/data"
+      - type: volume
+        source: mailu_data
+        target: /data
+    depends_on:
+      - imap
+    deploy:
+      replicas: 2
+
+  fetchmail:
+    image: mailu/fetchmail:master
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/data:/data"
+      - type: volume
+        source: mailu_data
+        target: /data
+    deploy:
+      replicas: 1
+
+networks:
+  default:
+    external:
+      name: mailu_default
+
+volumes:
+  mailu_filter:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/filter"
+  mailu_dkim:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/dkim"
+  mailu_overrides_rspamd:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/overrides/rspamd"
+  mailu_data:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/data"
+  mailu_mail:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/mail"
+  mailu_overrides:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/overrides"
+  mailu_dav:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/dav"
+  mailu_certs:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/certs"
+  mailu_redis:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,nolock,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/redis"
+```
+
+### Deploy Mailu on the docker swarm
+Run the following command:
+```bash
+docker stack deploy -c docker-compose-stack.yml mailu
+```
+See how the services are being deployed:
+```bash
+core@coreos-01 ~ $ docker service ls
+ID                  NAME                                 MODE                REPLICAS            IMAGE                                     PORTS
+ywnsetmtkb1l        mailu_antivirus                      replicated          1/1                 mailu/none:1.5
+pqokiaz0q128        mailu_fetchmail                      replicated          1/1                 mailu/fetchmail:1.5
+```
+check a specific service:
+```bash
+core@coreos-01 ~ $ docker service ps mailu_fetchmail
+ID                  NAME                IMAGE                 NODE                DESIRED STATE       CURRENT STATE         ERROR               PORTS
+tbu8ppgsdffj        mailu_fetchmail.1   mailu/fetchmail:1.5   coreos-01           Running             Running 11 days ago
+```
+
+### Remove the stack
+Run the follwoing command:
+```bash
+core@coreos-01 ~ $ docker stack rm mailu
+```
diff --git a/services/rspamd/conf/worker-controller.inc b/services/rspamd/conf/worker-controller.inc
index 6a020672..0cb0d5c0 100644
--- a/services/rspamd/conf/worker-controller.inc
+++ b/services/rspamd/conf/worker-controller.inc
@@ -1,3 +1,3 @@
 bind_socket = "*:11334";
 password = "mailu";
-secure_ip = "{{ FRONT_ADDRESS }}";
+secure_ip = "{{ FRONT_ADDRESS }} {{ POD_ADDRESS_RANGE }}";

From f5f09fad6ecc41e64b90dc4044450b61ea19ae4a Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Tue, 25 Sep 2018 18:54:40 +0000
Subject: [PATCH 03/53] Reverting the patch for dovecot.conf, as it is not
 needed

---
 core/dovecot/conf/dovecot.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index 7cf10774..a5973bf8 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -5,7 +5,7 @@ log_path = /dev/stderr
 protocols = imap pop3 lmtp sieve
 postmaster_address = {{ POSTMASTER }}@{{ DOMAIN }}
 hostname = {{ HOSTNAMES.split(",")[0] }}
-submission_host = {{ FRONT_ADDRESS }} {{ POD_ADDRESS_RANGE }}
+submission_host = {{ FRONT_ADDRESS }}
 
 service dict {
   unix_listener dict {

From fcad52b1454aeeb5b11d64fe0186f644922f96b2 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Thu, 27 Sep 2018 22:45:16 +0200
Subject: [PATCH 04/53] Implement a start date filter for autoreply, fixes #362

---
 core/admin/mailu/models.py                    |  2 ++
 core/admin/mailu/ui/forms.py                  |  1 +
 core/admin/mailu/ui/templates/user/reply.html |  7 ++++--
 .../migrations/versions/3b281286c7bd_.py      | 24 +++++++++++++++++++
 core/dovecot/conf/pigeonhole-sieve.dict       |  8 +++++++
 core/dovecot/sieve/before.sieve               |  1 +
 6 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 core/admin/migrations/versions/3b281286c7bd_.py

diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 71c5f4d7..1be4c8e6 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -249,6 +249,8 @@ class User(Base, Email):
     reply_enabled = db.Column(db.Boolean(), nullable=False, default=False)
     reply_subject = db.Column(db.String(255), nullable=True, default=None)
     reply_body = db.Column(db.Text(), nullable=True, default=None)
+    reply_startdate = db.Column(db.Date, nullable=False,
+        default=date(1900, 1, 1))
     reply_enddate = db.Column(db.Date, nullable=False,
         default=date(2999, 12, 31))
 
diff --git a/core/admin/mailu/ui/forms.py b/core/admin/mailu/ui/forms.py
index 326d721b..4f7a30ae 100644
--- a/core/admin/mailu/ui/forms.py
+++ b/core/admin/mailu/ui/forms.py
@@ -117,6 +117,7 @@ class UserReplyForm(flask_wtf.FlaskForm):
     reply_subject = fields.StringField(_('Reply subject'))
     reply_body = fields.StringField(_('Reply body'),
         widget=widgets.TextArea())
+    reply_startdate = fields.html5.DateField(_('Start of vacation'))
     reply_enddate = fields.html5.DateField(_('End of vacation'))
     submit = fields.SubmitField(_('Update'))
 
diff --git a/core/admin/mailu/ui/templates/user/reply.html b/core/admin/mailu/ui/templates/user/reply.html
index 7906bc42..7225a178 100644
--- a/core/admin/mailu/ui/templates/user/reply.html
+++ b/core/admin/mailu/ui/templates/user/reply.html
@@ -13,14 +13,17 @@
 <form class="form" method="post" role="form">
   {{ form.hidden_tag() }}
   {{ macros.form_field(form.reply_enabled,
-      onchange="if(this.checked){$('#reply_subject,#reply_body,#reply_enddate').removeAttr('readonly')}
+      onchange="if(this.checked){$('#reply_subject,#reply_body,#reply_enddate,#reply_startdate').removeAttr('readonly')}
                 else{$('#reply_subject,#reply_body,#reply_enddate').attr('readonly', '')}") }}
   {{ macros.form_field(form.reply_subject,
       **{("rw" if user.reply_enabled else "readonly"): ""}) }}
     {{ macros.form_field(form.reply_body, rows=10,
         **{("rw" if user.reply_enabled else "readonly"): ""}) }}
   {{ macros.form_field(form.reply_enddate,
-      **{("rw" if user.reply_enabled else "readonly"): ""}) }}
+        **{("rw" if user.reply_enabled else "readonly"): ""}) }}
+  {{ macros.form_field(form.reply_startdate,
+        **{("rw" if user.reply_enabled else "readonly"): ""}) }}
+
   {{ macros.form_field(form.submit) }}
 </form>
 {% endcall %}
diff --git a/core/admin/migrations/versions/3b281286c7bd_.py b/core/admin/migrations/versions/3b281286c7bd_.py
new file mode 100644
index 00000000..78e44a4c
--- /dev/null
+++ b/core/admin/migrations/versions/3b281286c7bd_.py
@@ -0,0 +1,24 @@
+""" Add a start day for vacations
+
+Revision ID: 3b281286c7bd
+Revises: 049fed905da7
+Create Date: 2018-09-27 22:20:08.158553
+
+"""
+
+revision = '3b281286c7bd'
+down_revision = '049fed905da7'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    with op.batch_alter_table('user') as batch:
+        batch.add_column(sa.Column('reply_startdate', sa.Date(), nullable=False,
+            server_default="1900-01-01"))
+
+
+def downgrade():
+    with op.batch_alter_table('user') as batch:
+        batch.drop_column('reply_startdate')
diff --git a/core/dovecot/conf/pigeonhole-sieve.dict b/core/dovecot/conf/pigeonhole-sieve.dict
index 917fce83..604371a8 100644
--- a/core/dovecot/conf/pigeonhole-sieve.dict
+++ b/core/dovecot/conf/pigeonhole-sieve.dict
@@ -41,3 +41,11 @@ map {
   username_field = email
   value_field = reply_enddate
 }
+
+map {
+  pattern = priv/reply_startdate
+  table = user
+  username_field = email
+  value_field = reply_startdate
+}
+
diff --git a/core/dovecot/sieve/before.sieve b/core/dovecot/sieve/before.sieve
index 6ebc20c5..81d20f30 100644
--- a/core/dovecot/sieve/before.sieve
+++ b/core/dovecot/sieve/before.sieve
@@ -34,6 +34,7 @@ if exists "X-Virus" {
 }
 
 if allof (string :is "${extdata.reply_enabled}" "1",
+          currentdate :value "ge" "date" "${extdata.reply_startdate}",
           currentdate :value "le" "date" "${extdata.reply_enddate}")
 {
   vacation :days 1 :subject "${extdata.reply_subject}" "${extdata.reply_body}";

From 6b34b2728ece020918dcb10a901afdd9894a69e3 Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Sun, 7 Oct 2018 16:38:41 +0000
Subject: [PATCH 05/53] Declare fuzzy_worker port 11335 in EXPOSE section

---
 services/rspamd/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/rspamd/Dockerfile b/services/rspamd/Dockerfile
index 7dff8c1f..cfb4d0eb 100644
--- a/services/rspamd/Dockerfile
+++ b/services/rspamd/Dockerfile
@@ -9,7 +9,7 @@ RUN mkdir /run/rspamd
 COPY conf/ /conf
 COPY start.py /start.py
 
-EXPOSE 11332/tcp 11334/tcp
+EXPOSE 11332/tcp 11334/tcp 11335/tcp
 
 VOLUME ["/var/lib/rspamd"]
 

From 1f71d10899d72571b39a60448a23adc41d5f10f2 Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Sun, 7 Oct 2018 16:46:42 +0000
Subject: [PATCH 06/53] Change POD_ADDRESS_RANGE introduction like it is done
 on deovecot-sql.conf.ext

---
 services/rspamd/conf/worker-controller.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/rspamd/conf/worker-controller.inc b/services/rspamd/conf/worker-controller.inc
index 0cb0d5c0..4b23a897 100644
--- a/services/rspamd/conf/worker-controller.inc
+++ b/services/rspamd/conf/worker-controller.inc
@@ -1,3 +1,3 @@
 bind_socket = "*:11334";
 password = "mailu";
-secure_ip = "{{ FRONT_ADDRESS }} {{ POD_ADDRESS_RANGE }}";
+secure_ip = "{% if POD_ADDRESS_RANGE %}{{ POD_ADDRESS_RANGE }}{% else %}{{ FRONT_ADDRESS }}{% endif %}";

From 9d610f56f7ff39232cb15ce02b42f8aca94d846a Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Mon, 8 Oct 2018 18:53:44 +0000
Subject: [PATCH 07/53] Added some lines around ingress mode

---
 docs/swarm/master/README.md | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/docs/swarm/master/README.md b/docs/swarm/master/README.md
index 1406e05c..c09f1dd3 100644
--- a/docs/swarm/master/README.md
+++ b/docs/swarm/master/README.md
@@ -57,8 +57,11 @@ core@coreos-01 ~ $ sudo umount /mnt/local/
 
 
 ### Networking mode
-On a swarm, the services are available (default mode) through a routing mesh managed by docker itself. With this mode, each service is given a virtual IP adress and docker manages the routing between this virtual IP and the container(s) providing this service. 
+On this example, we are using:
+- the mesh routing mode (default mode). With this mode, each service is given a virtual IP adress and docker manages the routing between this virtual IP and the container(s) providing this service. 
+- the default ingress mode.
 
+## Allow authentification with the mesh routing
 In order to allow every (front & webmail) container to access the other services, we will use the variable POD_ADDRESS_RANGE.
 
 Let's create the mailu_default network:
@@ -68,8 +71,22 @@ core@coreos-01 ~ $ docker network inspect mailu_default | grep Subnet
                     "Subnet": "10.0.1.0/24",
 ```
 In the docker-compose.yml file, we will then use POD_ADDRESS_RANGE = 10.0.1.0/24 
+In fact, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of  "mailu_default-endpoint". So it is sufficient to set POD_ADDRESS_RANGE to this specific ip (which can be found by inspecting mailu_default network). The issue is that this endpoint is created while the stack is created, I did'nt figure a way to determine this IP before the stack creation...
+
+## Limitation with the ingress mode
+With the default ingress mode, the front(s) container(s) will see origin IP(s) all being 10.255.0.x (which is the ingress-endpoint, can be found by inspecting the ingress network)
+
+This issue is known and discussed here:
+
+https://github.com/moby/moby/issues/25526
+
+A workaround (using network host mode and global deployment) is discussed here:
+
+https://github.com/moby/moby/issues/25526#issuecomment-336363408 
+
+## Don't create an open relay !
+As a side effect of this ingress mode "feature", make sure that the ingress subnet is not in your RELAYHOST, otherwise you would create an smtp open relay :-(
 
-Nota: on my setup, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of  "mailu_default-endpoint". So it might be sufficient to set POD_ADDRESS_RANGE to this specific ip (which can be found by inspecting mailu_default network)
 
 ### Scalability
 - smtp and imap are scalable

From 6bd365e7714e765c75d8fdd93bc04065a53eae14 Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Mon, 8 Oct 2018 21:00:44 +0000
Subject: [PATCH 08/53] Change title layout

---
 docs/swarm/master/README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/swarm/master/README.md b/docs/swarm/master/README.md
index c09f1dd3..2a2a021a 100644
--- a/docs/swarm/master/README.md
+++ b/docs/swarm/master/README.md
@@ -56,12 +56,12 @@ core@coreos-01 ~ $ sudo umount /mnt/local/
 ```
 
 
-### Networking mode
+## Networking mode
 On this example, we are using:
 - the mesh routing mode (default mode). With this mode, each service is given a virtual IP adress and docker manages the routing between this virtual IP and the container(s) providing this service. 
 - the default ingress mode.
 
-## Allow authentification with the mesh routing
+### Allow authentification with the mesh routing
 In order to allow every (front & webmail) container to access the other services, we will use the variable POD_ADDRESS_RANGE.
 
 Let's create the mailu_default network:
@@ -73,7 +73,7 @@ core@coreos-01 ~ $ docker network inspect mailu_default | grep Subnet
 In the docker-compose.yml file, we will then use POD_ADDRESS_RANGE = 10.0.1.0/24 
 In fact, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of  "mailu_default-endpoint". So it is sufficient to set POD_ADDRESS_RANGE to this specific ip (which can be found by inspecting mailu_default network). The issue is that this endpoint is created while the stack is created, I did'nt figure a way to determine this IP before the stack creation...
 
-## Limitation with the ingress mode
+### Limitation with the ingress mode
 With the default ingress mode, the front(s) container(s) will see origin IP(s) all being 10.255.0.x (which is the ingress-endpoint, can be found by inspecting the ingress network)
 
 This issue is known and discussed here:
@@ -84,22 +84,22 @@ A workaround (using network host mode and global deployment) is discussed here:
 
 https://github.com/moby/moby/issues/25526#issuecomment-336363408 
 
-## Don't create an open relay !
+### Don't create an open relay !
 As a side effect of this ingress mode "feature", make sure that the ingress subnet is not in your RELAYHOST, otherwise you would create an smtp open relay :-(
 
 
-### Scalability
+## Scalability
 - smtp and imap are scalable
 - front and webmail are scalable (pending POD_ADDRESS_RANGE is used), although the let's encrypt magic might not like it (race condidtion ? or risk to be banned by let's encrypt server if too many front containers attemps to renew the certs at the same time) 
 - redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file)
 
-### Variable substitution and docker-compose.yml
+## Variable substitution and docker-compose.yml
 The docker stack deploy command doesn't support variable substitution in the .yml file itself (but we still can use .env file to pass variables to the services). As a consequence we need to adjust the docker-compose file in order to :
 - remove all variables : $VERSION , $BIND_ADDRESS4 , $BIND_ADDRESS6 , $ANTIVIRUS , $WEBMAIL , etc
 - change the way we define the volumes (nfs share in our case)
 - add a deploy section for every service
 
-### Docker compose 
+## Docker compose 
 An example of docker-compose-stack.yml file is available here:
 
 ```yaml
@@ -340,7 +340,7 @@ volumes:
       device: ":/mnt/Pool1/pv/mailu/redis"
 ```
 
-### Deploy Mailu on the docker swarm
+## Deploy Mailu on the docker swarm
 Run the following command:
 ```bash
 docker stack deploy -c docker-compose-stack.yml mailu
@@ -359,7 +359,7 @@ ID                  NAME                IMAGE                 NODE
 tbu8ppgsdffj        mailu_fetchmail.1   mailu/fetchmail:1.5   coreos-01           Running             Running 11 days ago
 ```
 
-### Remove the stack
+## Remove the stack
 Run the follwoing command:
 ```bash
 core@coreos-01 ~ $ docker stack rm mailu

From 5035975c4168980c7dacc7f80c49b062c89eb7c6 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Mon, 15 Oct 2018 22:07:38 +0200
Subject: [PATCH 09/53] Remove Postfix debugging

---
 core/postfix/conf/main.cf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/postfix/conf/main.cf b/core/postfix/conf/main.cf
index cd052d46..1f5c8f7c 100644
--- a/core/postfix/conf/main.cf
+++ b/core/postfix/conf/main.cf
@@ -2,8 +2,6 @@
 # General
 ###############
 
-debug_peer_list = 0.0.0.0/0
-
 # Main domain and hostname
 mydomain = {{ DOMAIN }}
 myhostname = {{ HOSTNAMES.split(",")[0] }}

From 11a8e49f059c4eb71a8f931edcbfa238d90873a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Tue, 16 Oct 2018 11:09:42 +0300
Subject: [PATCH 10/53] Compose file upgrade and define more variables for
 setup

---
 setup/flavors/compose/docker-compose.yml | 38 ++++++++++++------------
 setup/flavors/compose/mailu.env          | 16 +++++-----
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index fcf0c092..a82817af 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -2,7 +2,7 @@
 # This file is auto-generated by the Mailu configuration wizard.
 # Please read the documentation before attempting any change.
 
-version: '2'
+version: '3.7'
 
 services:
 
@@ -11,7 +11,7 @@ services:
     image: redis:alpine
     restart: always
     volumes:
-      - "$ROOT/redis:/data"
+      - "{{ root }}/redis:/data"
 
   # Core services
   front:
@@ -24,15 +24,15 @@ services:
     ports:
     {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
     {% if bind4 %}
-      - "$PUBLIC_IPV4:{{ port }}:{{ port }}"
+      - "{{ bind4}}:{{ port }}:{{ port }}"
     {% endif %}
     {% if bind6 %}
-      - "$PUBLIC_IPV6:{{ port }}:{{ port }}"
+      - "{{ bind6 }}:{{ port }}:{{ port }}"
     {% endif %}
     {% endfor %}
     {% if flavor in ('cert', 'mail') %}
     volumes:
-      - "$ROOT/certs:/certs"
+      - "{{ root }}/certs:/certs"
     {% endif %}
 
   admin:
@@ -44,8 +44,8 @@ services:
       - 127.0.0.1:8080:80
     {% endif %}
     volumes:
-      - "$ROOT/data:/data"
-      - "$ROOT/dkim:/dkim"
+      - "{{ root }}/data:/data"
+      - "{{ root }}/dkim:/dkim"
     depends_on:
       - redis
 
@@ -54,9 +54,9 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "$ROOT/data:/data"
-      - "$ROOT/mail:/mail"
-      - "$ROOT/overrides:/overrides"
+      - "{{ root }}/data:/data"
+      - "{{ root }}/mail:/mail"
+      - "{{ root }}/overrides:/overrides"
     depends_on:
       - front
 
@@ -65,8 +65,8 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "$ROOT/data:/data"
-      - "$ROOT/overrides:/overrides"
+      - "{{ root }}/data:/data"
+      - "{{ root }}/overrides:/overrides"
     depends_on:
       - front
 
@@ -77,9 +77,9 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "$ROOT/filter:/var/lib/rspamd"
-      - "$ROOT/dkim:/dkim"
-      - "$ROOT/overrides/rspamd:/etc/rspamd/override.d"
+      - "{{ root }}/filter:/var/lib/rspamd"
+      - "{{ root }}/dkim:/dkim"
+      - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
     depends_on:
       - front
   {% endif %}
@@ -90,7 +90,7 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "$ROOT/filter:/data"
+      - "{{ root }}/filter:/data"
   {% endif %}
 
   {% if enable_webdav %}
@@ -99,7 +99,7 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "$ROOT/dav:/data"
+      - "{{ root }}/dav:/data"
   {% endif %}
 
   {% if enable_fetchmail %}
@@ -108,7 +108,7 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "$ROOT/data:/data"
+      - "{{ root }}/data:/data"
   {% endif %}
 
   # Webmail
@@ -118,7 +118,7 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "$ROOT/webmail:/data"
+      - "{{ root }}/webmail:/data"
     depends_on:
       - imap
   {% endif %}
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 24d7b247..2de771f3 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -9,14 +9,16 @@
 ###################################
 
 # Set this to the path where Mailu data and configuration is stored
-ROOT=/mailu
+# This variable is now set directly in `docker-compose.yml by the setup utility
+# ROOT=/mailu
 
 # Set to a randomly generated 16 bytes string
 SECRET_KEY={{ secret(16) }}
 
 # Address where listening ports should bind
-{% if bind4 %}PUBLIC_IPV4={{ bind4 }}{% endif %}
-{% if bind6 %}PUBLIC_IPV6={{ bind6 }}{% endif %}
+# This variables are now set directly in `docker-compose.yml by the setup utility
+# PUBLIC_IPV4=127.0.0.1
+# PUBLIC_IPV6=::1
 
 # Mail address of the postmaster
 POSTMASTER={{ postmaster }}
@@ -75,16 +77,16 @@ DOMAIN_REGISTRATION=true
 ###################################
 
 # Path to the admin interface if enabled
-WEB_ADMIN=/admin
+WEB_ADMIN={{ admin_path }}
 
 # Path to the webmail if enabled
-WEB_WEBMAIL=/webmail
+WEB_WEBMAIL={{ webmail_path }}
 
 # Website name
-SITENAME=Mailu
+SITENAME={{ site_name }{
 
 # Linked Website URL
-WEBSITE=https://mailu.io
+WEBSITE={{ website }}
 
 {% if recaptcha_public_key and recaptcha_private_key %}
 # Registration reCaptcha settings (warning, this has some privacy impact)

From 0d164486b45b194de81905089b37a4557a828a8f Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Tue, 16 Oct 2018 12:34:55 +0300
Subject: [PATCH 11/53] docker-compose variables and setup

---
 setup/Dockerfile                         | 4 +++-
 setup/docker-compose.yml                 | 1 +
 setup/flavors/compose/docker-compose.yml | 2 +-
 setup/flavors/compose/mailu.env          | 8 ++++----
 setup/flavors/compose/setup.html         | 6 +++---
 setup/server.py                          | 6 ++++--
 setup/templates/steps/expose.html        | 4 ++--
 setup/templates/steps/root.html          | 8 ++++++++
 setup/templates/wizard.html              | 1 +
 9 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 setup/templates/steps/root.html

diff --git a/setup/Dockerfile b/setup/Dockerfile
index 1fc808f1..c970e57d 100644
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -10,8 +10,10 @@ RUN apk add --no-cache git \
 COPY server.py ./server.py
 COPY setup.py ./setup.py
 COPY main.py ./main.py
+COPY flavors /data/master/flavors
+COPY templates /data/master/templates
 
-RUN python setup.py https://github.com/mailu/mailu /data
+#RUN python setup.py https://github.com/mailu/mailu /data
 
 EXPOSE 80/tcp
 
diff --git a/setup/docker-compose.yml b/setup/docker-compose.yml
index 9288bb7e..30966167 100644
--- a/setup/docker-compose.yml
+++ b/setup/docker-compose.yml
@@ -10,4 +10,5 @@ services:
     image: mailu/setup
     ports:
       - "80:80"
+    build: .
 
diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index a82817af..3dcfa5a2 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     ports:
     {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
     {% if bind4 %}
-      - "{{ bind4}}:{{ port }}:{{ port }}"
+      - "{{ bind4 }}:{{ port }}:{{ port }}"
     {% endif %}
     {% if bind6 %}
       - "{{ bind6 }}:{{ port }}:{{ port }}"
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 2de771f3..1512e75b 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -10,15 +10,15 @@
 
 # Set this to the path where Mailu data and configuration is stored
 # This variable is now set directly in `docker-compose.yml by the setup utility
-# ROOT=/mailu
+# ROOT= {{ root }}
 
 # Set to a randomly generated 16 bytes string
 SECRET_KEY={{ secret(16) }}
 
 # Address where listening ports should bind
 # This variables are now set directly in `docker-compose.yml by the setup utility
-# PUBLIC_IPV4=127.0.0.1
-# PUBLIC_IPV6=::1
+# PUBLIC_IPV4= {{ bind4 }} (default: 127.0.0.1)
+# PUBLIC_IPV6= {{ bind6 }} (default: ::1)
 
 # Mail address of the postmaster
 POSTMASTER={{ postmaster }}
@@ -83,7 +83,7 @@ WEB_ADMIN={{ admin_path }}
 WEB_WEBMAIL={{ webmail_path }}
 
 # Website name
-SITENAME={{ site_name }{
+SITENAME={{ site_name }}
 
 # Linked Website URL
 WEBSITE={{ website }}
diff --git a/setup/flavors/compose/setup.html b/setup/flavors/compose/setup.html
index e4506e6d..3c190c9c 100644
--- a/setup/flavors/compose/setup.html
+++ b/setup/flavors/compose/setup.html
@@ -4,13 +4,13 @@
 <p>Docker Compose expects a project file, named <code>docker-compose.yml</code>
 in a project directory. First create your project directory.</p>
 
-<pre><code>mkdir /mailu
+<pre><code>mkdir {{ root }}
 </pre></code>
 
 <p>Then download the project file. A side configuration file makes it easier
 to read and check the configuration variables generated by the wizard.</p>
 
-<pre><code>cd /mailu
+<pre><code>cd {{ root }}
 wget {{ url_for('.file', uid=uid, filepath='docker-compose.yml', _external=True) }}
 wget {{ url_for('.file', uid=uid, filepath='mailu.env', _external=True) }}
 </pre></code>
@@ -30,7 +30,7 @@ files before going any further.</p>
 <p>To start your compose project, simply run the Docker Compose <code>up</code>
 command.</p>
 
-<pre><code>cd /mailu
+<pre><code>cd {{ root }}
 docker-compose up -d
 </pre></code>
 {% endcall %}
diff --git a/setup/server.py b/setup/server.py
index 108f5043..ddeafd90 100644
--- a/setup/server.py
+++ b/setup/server.py
@@ -32,9 +32,11 @@ def secret(length=16):
 
 def build_app(path):
 
+    #Hardcoded master as the only version for test purposes
     versions = [
-        version for version in os.listdir(path)
-        if os.path.isdir(os.path.join(path, version))
+    #    version for version in os.listdir(path)
+    #    if os.path.isdir(os.path.join(path, version))
+         "master"
     ]
 
     app.jinja_env.trim_blocks = True
diff --git a/setup/templates/steps/expose.html b/setup/templates/steps/expose.html
index 665b08a2..372ebddc 100644
--- a/setup/templates/steps/expose.html
+++ b/setup/templates/steps/expose.html
@@ -14,12 +14,12 @@ avoid generic all-interfaces addresses like <code>0.0.0.0</code> or <code>::</co
 
 <div class="form-group">
   <label>IPv4 listen address</label>
-  <input class="form-control" type="text" name="ip4" placeholder="1.2.3.4">
+  <input class="form-control" type="text" name="bind4" placeholder="1.2.3.4">
 </div>
 
 <div class="form-group">
   <label>IPv6 listen address</label>
-  <input class="form-control" type="text" name="ip6" placeholder="2001:be4:1234::1">
+  <input class="form-control" type="text" name="bind6" placeholder="2001:be4:1234::1">
 </div>
 
 <p>You server will be available under a main hostname but may expose multiple public
diff --git a/setup/templates/steps/root.html b/setup/templates/steps/root.html
new file mode 100644
index 00000000..f32c2250
--- /dev/null
+++ b/setup/templates/steps/root.html
@@ -0,0 +1,8 @@
+{% call macros.panel("info", "Step 0 - Set root path") %}
+<p>Before starting root path must be set</p>
+
+<div class="form-group">
+  <label>Root path: </label>
+  <input class="form-control" type="text" name="root" placeholder="/mailu">
+</div>
+{% endcall %}
diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html
index da9d5134..bbebe569 100644
--- a/setup/templates/wizard.html
+++ b/setup/templates/wizard.html
@@ -9,6 +9,7 @@
   {% endcall %}
 
   <form method="post" action="{{ url_for(".submit") }}">
+  {% include "steps/root.html" %}
   {% include "steps/flavor.html" %}
   {% include "steps/expose.html" %}
   {% include "steps/services.html" %}

From e8dee22ecfc8836f7d0a9ec56b3d68fba582b718 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Tue, 16 Oct 2018 16:12:42 +0300
Subject: [PATCH 12/53] Added vars and fixed naming use

---
 setup/flavors/compose/docker-compose.yml  | 10 ++--
 setup/flavors/compose/mailu.env           | 32 +++++++++++--
 setup/templates/steps/initial-config.html | 58 +++++++++++++++++++++++
 setup/templates/steps/root.html           |  8 ----
 setup/templates/steps/services.html       | 15 ++++--
 setup/templates/wizard.html               |  4 +-
 6 files changed, 105 insertions(+), 22 deletions(-)
 create mode 100644 setup/templates/steps/initial-config.html
 delete mode 100644 setup/templates/steps/root.html

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 3dcfa5a2..bf6c2db8 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -71,7 +71,7 @@ services:
       - front
 
   # Optional services
-  {% if enable_antispam %}
+  {% if antispam_enabled %}
   antispam:
     image: mailu/rspamd:{{ version }}
     restart: always
@@ -84,7 +84,7 @@ services:
       - front
   {% endif %}
 
-  {% if enable_antivirus %}
+  {% if antivirus_enabled %}
   antivirus:
     image: mailu/clamav:{{ version }}
     restart: always
@@ -93,9 +93,9 @@ services:
       - "{{ root }}/filter:/data"
   {% endif %}
 
-  {% if enable_webdav %}
+  {% if webdav_enabled %}
   webdav:
-    image: mailu/radivale:{{ version }}
+    image: mailu/radicale:{{ version }}
     restart: always
     env_file: {{ env }}
     volumes:
@@ -112,7 +112,7 @@ services:
   {% endif %}
 
   # Webmail
-  {% if enable_webmail %}
+  {% if webmail_enabled %}
   webmail:
     image: mailu/{{ webmail }}:{{ version }}
     restart: always
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 1512e75b..4f470533 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -10,7 +10,7 @@
 
 # Set this to the path where Mailu data and configuration is stored
 # This variable is now set directly in `docker-compose.yml by the setup utility
-# ROOT= {{ root }}
+# ROOT={{ root }}
 
 # Set to a randomly generated 16 bytes string
 SECRET_KEY={{ secret(16) }}
@@ -20,8 +20,14 @@ SECRET_KEY={{ secret(16) }}
 # PUBLIC_IPV4= {{ bind4 }} (default: 127.0.0.1)
 # PUBLIC_IPV6= {{ bind6 }} (default: ::1)
 
+# Main mail domain
+# DOMAIN={{ domain }}
+
 # Mail address of the postmaster
-POSTMASTER={{ postmaster }}
+POSTMASTER={{ postmaster or 'admin'}}
+
+#Chose how secure connections will behave:
+#TLS_FLAVOR={{ tls_flavor }}
 
 # Hostnames for this server, separated with comas
 HOSTNAMES={{ hostnames }}
@@ -30,7 +36,27 @@ HOSTNAMES={{ hostnames }}
 AUTH_RATELIMIT={{ auth_ratelimit }}
 
 # Opt-out of statistics, replace with "True" to opt out
-DISABLE_STATISTICS={{ disable_statistics }}
+DISABLE_STATISTICS={{ disable_statistics or 'False' }}
+
+###################################
+# Optional features
+###################################
+
+#Expose the admin interface
+ADMIN={{ admin_enabled or 'false' }}
+
+#Chose which webmail to run if any
+#WEBMAIL_ENABLED={{ webmail_enabled or 'false' }}
+WEBMAIL={{ webmail_type or 'none' }}
+
+#Antivirus solution
+ANTIVIRUS={{ antivirus_enabled or 'none' }}
+
+#Antispam solution
+#ANTISPAM={{ antispam_enabled or 'none'}}
+
+#Dav server implementation
+WEBDAV={{ webdav_enabled or 'none' }}
 
 ###################################
 # Server behavior
diff --git a/setup/templates/steps/initial-config.html b/setup/templates/steps/initial-config.html
new file mode 100644
index 00000000..d71d2971
--- /dev/null
+++ b/setup/templates/steps/initial-config.html
@@ -0,0 +1,58 @@
+{% call macros.panel("info", "Step 0 - Initial configuration") %}
+<p>Before starting some variables must be st</p>
+
+<div class="form-group">
+  <label>Root path: </label>
+  <input class="form-control" type="text" name="root" placeholder="/mailu">
+</div>
+
+<div class="form-group">
+  <label>Main mail domain</label>
+  <input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io">
+</div>
+
+<div class="form-group">
+  <label>Postmaster local part (will append the main mail domain)</label>
+  <input class="form-control" type="text" name="postmaster" placeholder="default: admin">
+</div>
+
+<div class="form-group">
+  <label>Choose how secure connections will behave </label>
+  <br/>
+  <select name="tls_flavor">
+  	{% for tlsflavor in ["letsencrypt", "cert", "notls", "mail", "mail-letsencrypt"] %}
+  	<option value="{{ tlsflavor }}" >{{ tlsflavor }}</option>
+  	{% endfor %}
+  </select>
+</div>
+
+<div class="form-group">
+  <label>Authentication rate limit (per source IP address)</label>
+  <input class="form-control" type="text" name="auth_ratelimit" placeholder="eg 10/minute;1000/hour">
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="disable_statistics" value="True">
+    Opt-out of statistics
+  </label>
+</div>
+
+<div class="form-group">
+  <label>Website name</label>
+  <input class="form-control" type="text" name="site_name" placeholder="Mailu">
+</div>
+
+<div class="form-group">
+  <label>Linked Website URL</label>
+  <input class="form-control" type="text" name="website" placeholder="https://mailu.io">
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="domain_registration" value="true">
+    Domain registration
+  </label>
+</div>
+
+{% endcall %}
diff --git a/setup/templates/steps/root.html b/setup/templates/steps/root.html
deleted file mode 100644
index f32c2250..00000000
--- a/setup/templates/steps/root.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% call macros.panel("info", "Step 0 - Set root path") %}
-<p>Before starting root path must be set</p>
-
-<div class="form-group">
-  <label>Root path: </label>
-  <input class="form-control" type="text" name="root" placeholder="/mailu">
-</div>
-{% endcall %}
diff --git a/setup/templates/steps/services.html b/setup/templates/steps/services.html
index e80b4ff4..e6ee88aa 100644
--- a/setup/templates/steps/services.html
+++ b/setup/templates/steps/services.html
@@ -9,7 +9,7 @@ manage your email domains, users, etc.</p>
 <div class="form-group">
   <label>Enable the admin UI (and path to the admin UI)</label>
   <div class="input-group">
-    <div class="input-group-addon"><input type="checkbox" name="admin_enabled" checked></div>
+    <div class="input-group-addon"><input type="checkbox" name="admin_enabled" value="true"></div>
     <input class="form-control" type="text" name="admin_path" value="/admin">
   </div>
 </div>
@@ -21,7 +21,7 @@ accessing messages for beginner users.</p>
 <div class="form-group">
   <label>Enable Web email client (and path to the Web email client)</label>
   <div class="input-group">
-    <div class="input-group-addon"><input type="checkbox" name="webmail_enabled" checked></div>
+    <div class="input-group-addon"><input type="checkbox" name="webmail_enabled" value="true"></div>
     <input class="form-control" type="text" name="webmail_path" value="/webmail">
   </div>
   <p></p>
@@ -38,15 +38,22 @@ also disable the antivirus if required (it does use aroung 1GB of ram).</p>
 
 <div class="form-check form-check-inline">
   <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="antispam_enabled" checked>
+    <input class="form-check-input" type="checkbox" name="antispam_enabled" value="rspamd">
     Enable the filtering service
   </label>
 </div>
 <div class="form-check form-check-inline">
   <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="antivirus_enabled" checked>
+    <input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">
     Enable the antivirus service
   </label>
 </div>
 
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="webdav_enabled" value="radicale">
+    Enable the webdav service
+  </label>
+</div>
+
 {% endcall %}
diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html
index bbebe569..5a15af6f 100644
--- a/setup/templates/wizard.html
+++ b/setup/templates/wizard.html
@@ -9,11 +9,11 @@
   {% endcall %}
 
   <form method="post" action="{{ url_for(".submit") }}">
-  {% include "steps/root.html" %}
+  {% include "steps/initial-config.html" %}
   {% include "steps/flavor.html" %}
   {% include "steps/expose.html" %}
   {% include "steps/services.html" %}
-  {% include "steps/optional.html" %}
+<!--   {% include "steps/optional.html" %} -->
 
   <input class="btn btn-primary" type="submit" value="Setup Mailu">
   </form>

From b9ecc0ccc6380c51dfd032397524e8c0d9ab4073 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Tue, 16 Oct 2018 18:03:59 +0300
Subject: [PATCH 13/53] Added minor changes

---
 setup/flavors/compose/docker-compose.yml  | 10 ++++-----
 setup/flavors/compose/mailu.env           | 11 +++++-----
 setup/templates/steps/initial-config.html | 25 ++++++++++++-----------
 setup/templates/steps/services.html       | 11 ++++++++--
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index bf6c2db8..83a46169 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -19,8 +19,8 @@ services:
     restart: always
     env_file: {{ env }}
     env:
-      - TLS_FLAVOR={{ tls_flavor or 'letsencrypt' }}
-      - ADMIN={{ expose_admin or 'no' }}
+      - TLS_FLAVOR={{ tls_flavor }}
+      - ADMIN={{ admin_enabled or 'no' }}
     ports:
     {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
     {% if bind4 %}
@@ -39,7 +39,7 @@ services:
     image: mailu/admin:{{ version }}
     restart: always
     env_file: {{ env }}
-    {% if not expose_admin %}
+    {% if not admin_enabled %}
     ports:
       - 127.0.0.1:8080:80
     {% endif %}
@@ -102,7 +102,7 @@ services:
       - "{{ root }}/dav:/data"
   {% endif %}
 
-  {% if enable_fetchmail %}
+  {% if fetchmail_enabled %}
   fetchmail:
     image: mailu/fetchmail:{{ version }}
     restart: always
@@ -114,7 +114,7 @@ services:
   # Webmail
   {% if webmail_enabled %}
   webmail:
-    image: mailu/{{ webmail }}:{{ version }}
+    image: mailu/{{ webmail_type }}:{{ version }}
     restart: always
     env_file: {{ env }}
     volumes:
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 4f470533..b1cded1c 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -33,7 +33,8 @@ POSTMASTER={{ postmaster or 'admin'}}
 HOSTNAMES={{ hostnames }}
 
 # Authentication rate limit (per source IP address)
-AUTH_RATELIMIT={{ auth_ratelimit }}
+AUTH_RATELIMIT={% if auth_ratelimit_pm %}{{ auth_ratelimit_pm }}/minute;{% endif %}
+{% if auth_ratelimit_ph %}{{ auth_ratelimit_ph }}/hour{% endif %} 
 
 # Opt-out of statistics, replace with "True" to opt out
 DISABLE_STATISTICS={{ disable_statistics or 'False' }}
@@ -43,20 +44,20 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
 ###################################
 
 #Expose the admin interface
-ADMIN={{ admin_enabled or 'false' }}
+#ADMIN={{ admin_enabled or 'false' }}
 
 #Chose which webmail to run if any
 #WEBMAIL_ENABLED={{ webmail_enabled or 'false' }}
-WEBMAIL={{ webmail_type or 'none' }}
+#WEBMAIL={{ webmail_type or 'none' }}
 
 #Antivirus solution
-ANTIVIRUS={{ antivirus_enabled or 'none' }}
+#ANTIVIRUS={{ antivirus_enabled or 'none' }}
 
 #Antispam solution
 #ANTISPAM={{ antispam_enabled or 'none'}}
 
 #Dav server implementation
-WEBDAV={{ webdav_enabled or 'none' }}
+#WEBDAV={{ webdav_enabled or 'none' }}
 
 ###################################
 # Server behavior
diff --git a/setup/templates/steps/initial-config.html b/setup/templates/steps/initial-config.html
index d71d2971..c16d4c13 100644
--- a/setup/templates/steps/initial-config.html
+++ b/setup/templates/steps/initial-config.html
@@ -3,7 +3,7 @@
 
 <div class="form-group">
   <label>Root path: </label>
-  <input class="form-control" type="text" name="root" placeholder="/mailu">
+  <input class="form-control" type="text" name="root" value="/mailu">
 </div>
 
 <div class="form-group">
@@ -11,9 +11,16 @@
   <input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io">
 </div>
 
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="domain_registration" value="true">
+    Domain registration
+  </label>
+</div>
+
 <div class="form-group">
   <label>Postmaster local part (will append the main mail domain)</label>
-  <input class="form-control" type="text" name="postmaster" placeholder="default: admin">
+  <input class="form-control" type="text" name="postmaster" value="admin">
 </div>
 
 <div class="form-group">
@@ -28,7 +35,8 @@
 
 <div class="form-group">
   <label>Authentication rate limit (per source IP address)</label>
-  <input class="form-control" type="text" name="auth_ratelimit" placeholder="eg 10/minute;1000/hour">
+  <p><input class="form-control" style="width: 7%; display: inline;" type="text" name="auth_ratelimit_pm">/minute;
+  <input class="form-control" style="width: 7%; display: inline;;" type="text" name="auth_ratelimit_ph">/hour</p>
 </div>
 
 <div class="form-check form-check-inline">
@@ -40,19 +48,12 @@
 
 <div class="form-group">
   <label>Website name</label>
-  <input class="form-control" type="text" name="site_name" placeholder="Mailu">
+  <input class="form-control" type="text" name="site_name" value="Mailu">
 </div>
 
 <div class="form-group">
   <label>Linked Website URL</label>
-  <input class="form-control" type="text" name="website" placeholder="https://mailu.io">
-</div>
-
-<div class="form-check form-check-inline">
-  <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="domain_registration" value="true">
-    Domain registration
-  </label>
+  <input class="form-control" type="text" name="website" value="https://mailu.io">
 </div>
 
 {% endcall %}
diff --git a/setup/templates/steps/services.html b/setup/templates/steps/services.html
index e6ee88aa..ed529c83 100644
--- a/setup/templates/steps/services.html
+++ b/setup/templates/steps/services.html
@@ -38,8 +38,8 @@ also disable the antivirus if required (it does use aroung 1GB of ram).</p>
 
 <div class="form-check form-check-inline">
   <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="antispam_enabled" value="rspamd">
-    Enable the filtering service
+    <input class="form-check-input" type="checkbox" name="antispam_enabled" value="rspamd" checked>
+    Enable the spam filtering service
   </label>
 </div>
 <div class="form-check form-check-inline">
@@ -56,4 +56,11 @@ also disable the antivirus if required (it does use aroung 1GB of ram).</p>
   </label>
 </div>
 
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="fetchmail_enabled" value="true">
+    Enable fetchmail
+  </label>
+</div>
+
 {% endcall %}

From 5ada669f43b26b35c7f8ca2eab89fd8d2d5e3611 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Tue, 16 Oct 2018 20:38:18 +0200
Subject: [PATCH 14/53] Rebase reply startdate on master

---
 core/admin/mailu/internal/templates/default.sieve | 2 +-
 core/admin/mailu/models.py                        | 2 +-
 core/admin/migrations/versions/3b281286c7bd_.py   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/admin/mailu/internal/templates/default.sieve b/core/admin/mailu/internal/templates/default.sieve
index 214b8125..d771ee99 100644
--- a/core/admin/mailu/internal/templates/default.sieve
+++ b/core/admin/mailu/internal/templates/default.sieve
@@ -32,6 +32,6 @@ if exists "X-Virus" {
   stop;
 }
 
-{% if user.reply_active and  %}
+{% if user.reply_active  %}
 vacation :days 1 :subject "{{ user.reply_subject }}" "{{ user.reply_body }}";
 {% endif %}
diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index bb8cdc94..f7c3349d 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -280,7 +280,7 @@ class User(Base, Email):
 
     @property
     def reply_active(self):
-        now = datetime.datetime.now()
+        now = date.today()
         return (
             self.reply_enabled and
             self.reply_startdate < now and
diff --git a/core/admin/migrations/versions/3b281286c7bd_.py b/core/admin/migrations/versions/3b281286c7bd_.py
index 78e44a4c..57b5c327 100644
--- a/core/admin/migrations/versions/3b281286c7bd_.py
+++ b/core/admin/migrations/versions/3b281286c7bd_.py
@@ -1,13 +1,13 @@
 """ Add a start day for vacations
 
 Revision ID: 3b281286c7bd
-Revises: 049fed905da7
+Revises: 25fd6c7bcb4a
 Create Date: 2018-09-27 22:20:08.158553
 
 """
 
 revision = '3b281286c7bd'
-down_revision = '049fed905da7'
+down_revision = '25fd6c7bcb4a'
 
 from alembic import op
 import sqlalchemy as sa

From 8fa80c15894da57131cea00f8274737d37d8054f Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Tue, 16 Oct 2018 22:52:21 +0200
Subject: [PATCH 15/53] Support multiple docs versions

---
 docs/Dockerfile               |  6 +++++-
 docs/_templates/page.html     |  4 ----
 docs/_templates/versions.html | 16 ++++++++++++++++
 docs/conf.py                  |  8 +++++++-
 docs/docker-compose.yml       | 21 +++++++++++++++++++++
 5 files changed, 49 insertions(+), 6 deletions(-)
 delete mode 100644 docs/_templates/page.html
 create mode 100644 docs/_templates/versions.html
 create mode 100644 docs/docker-compose.yml

diff --git a/docs/Dockerfile b/docs/Dockerfile
index af481a27..c1992f32 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -2,6 +2,9 @@ FROM python:3-alpine
 
 COPY requirements.txt /requirements.txt
 
+ARG version=master
+ENV VERSION=$version
+
 RUN pip install -r /requirements.txt \
  && apk add --no-cache nginx \
  && mkdir /run/nginx
@@ -9,6 +12,7 @@ RUN pip install -r /requirements.txt \
 COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 COPY . /docs
 
-RUN sphinx-build /docs /build
+RUN mkdir -p /build/$VERSION \
+ && sphinx-build /docs /build/$VERSION
 
 CMD nginx -g "daemon off;"
\ No newline at end of file
diff --git a/docs/_templates/page.html b/docs/_templates/page.html
deleted file mode 100644
index 97296793..00000000
--- a/docs/_templates/page.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{%- extends "layout.html" %}
-{% block body %}
-  {{ body|replace("VERSION_TAG", version) }}
-{% endblock %}
diff --git a/docs/_templates/versions.html b/docs/_templates/versions.html
new file mode 100644
index 00000000..db4d332d
--- /dev/null
+++ b/docs/_templates/versions.html
@@ -0,0 +1,16 @@
+  <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+    <span class="rst-current-version" data-toggle="rst-current-version">
+      <span class="fa fa-book"> Versions</span>
+      v: {{ version }}
+      <span class="fa fa-caret-down"></span>
+    </span>
+    <div class="rst-other-versions">
+      <dl>
+        <dt>{{ _('Versions') }}</dt>
+        {% for slug, url in versions %}
+          <dd><a href="{{ url }}">{{ slug }}</a></dd>
+        {% endfor %}
+      </dl>
+    </div>
+  </div>
+
diff --git a/docs/conf.py b/docs/conf.py
index f89b39fd..e86a7b9e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 #
 
+import os
+
 extensions = ['sphinx.ext.imgmath', 'sphinx.ext.viewcode']
 templates_path = ['_templates']
 source_suffix = '.rst'
@@ -33,6 +35,10 @@ html_context = {
     'display_github': True,
     'github_user': 'mailu',
     'github_repo': 'mailu',
-    'github_version': 'master',
+    'github_version': os.environ.get('VERSION', 'master'),
+    'versions': [
+        ('1.5', '/1.5/'),
+        ('master', '/master/')
+    ],
     'conf_py_path': '/docs/'
 }
diff --git a/docs/docker-compose.yml b/docs/docker-compose.yml
new file mode 100644
index 00000000..0caaa7a4
--- /dev/null
+++ b/docs/docker-compose.yml
@@ -0,0 +1,21 @@
+version: '3'
+
+
+services:
+  docs_master:
+    image: mailu/docs:master
+    labels:
+      - traefik.enable=true
+      - traefik.port=80
+      - traefik.main.frontend.rule=Host:${hostname};PathPrefix:/master/
+
+  docs_15:
+    image: mailu/docs:1.5
+    labels:
+      - traefik.enable=true
+      - traefik.port=80
+      - traefik.root.frontend.redirect.regex=.*
+      - traefik.root.frontend.redirect.replacement=/1.5/
+      - traefik.root.frontend.rule=Host:${hostname};PathPrefix:/
+      - traefik.main.frontend.rule=Host:${hostname};PathPrefix:/1.5/
+

From 13e3862ca701f5ec5d5e2f3cbb1fff196f0220ca Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Tue, 16 Oct 2018 22:55:05 +0200
Subject: [PATCH 16/53] Simplify the docs configuration

---
 docs/_templates/layout.html | 2 --
 docs/conf.py                | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)
 delete mode 100644 docs/_templates/layout.html

diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
deleted file mode 100644
index 3f424a0a..00000000
--- a/docs/_templates/layout.html
+++ /dev/null
@@ -1,2 +0,0 @@
-{% set version=github_version %}
-{% extends "!layout.html" %}
diff --git a/docs/conf.py b/docs/conf.py
index e86a7b9e..4ac9de3d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -11,9 +11,9 @@ master_doc = 'index'
 project = 'Mailu'
 copyright = '2018, Mailu authors'
 author = 'Mailu authors'
-version = release = 'latest'
+version = release = os.environ.get('VERSION', 'master')
 language = None
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', 'Dockerfile', 'docker-compose.yml']
 pygments_style = 'sphinx'
 todo_include_todos = False
 html_theme = 'sphinx_rtd_theme'
@@ -35,7 +35,7 @@ html_context = {
     'display_github': True,
     'github_user': 'mailu',
     'github_repo': 'mailu',
-    'github_version': os.environ.get('VERSION', 'master'),
+    'github_version': version,
     'versions': [
         ('1.5', '/1.5/'),
         ('master', '/master/')

From 53b9c031c99ccb6c2530cacc8c54a57f92f82a58 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Tue, 16 Oct 2018 23:19:48 +0200
Subject: [PATCH 17/53] Add a warning banner when not reading the stable docs

---
 docs/_templates/layout.html | 9 +++++++++
 docs/conf.py                | 1 +
 2 files changed, 10 insertions(+)
 create mode 100644 docs/_templates/layout.html

diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
new file mode 100644
index 00000000..63db07e2
--- /dev/null
+++ b/docs/_templates/layout.html
@@ -0,0 +1,9 @@
+{% extends "!layout.html" %}
+{% block document %}
+{% if version != stable_version %}
+<div class="wy-alert info">
+    <p>You are currently browsing documentation for the <b>{{ version }}</b> branch. Documentation for the stable <b>{{ stable_version }}</b> branch can be found <a href="/{{ stable_version }}/">here</a>.</p>
+</div>
+{% endif %}
+{{ super() }}
+{% endblock %}
diff --git a/docs/conf.py b/docs/conf.py
index 4ac9de3d..64997eb1 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -36,6 +36,7 @@ html_context = {
     'github_user': 'mailu',
     'github_repo': 'mailu',
     'github_version': version,
+    'stable_version': '1.5',
     'versions': [
         ('1.5', '/1.5/'),
         ('master', '/master/')

From 4ea12deae792081d86372698dba8a4288bd68302 Mon Sep 17 00:00:00 2001
From: hacor <hacornelis@gmail.com>
Date: Wed, 17 Oct 2018 07:22:55 +0200
Subject: [PATCH 18/53] Added kubernetes to Mailu

---
 core/dovecot/Dockerfile                       |   4 +-
 core/nginx/Dockerfile                         |   4 +-
 core/nginx/conf/nginx.conf                    |   3 +
 core/postfix/Dockerfile                       |   2 +-
 core/postfix/conf/main.cf                     |   2 +-
 docs/compose/.env                             |   3 +
 docs/index.rst                                |   2 +-
 docs/kubernetes/index.rst                     |  26 --
 docs/kubernetes/kubernetes-mailu.yaml         | 419 ------------------
 .../kubernetes-nginx-ingress-controller.yaml  |  84 ----
 docs/kubernetes/mailu/admin-ingress.yaml      |  86 ++++
 docs/kubernetes/mailu/admin.yaml              |  63 +++
 docs/kubernetes/mailu/configmap.yaml          | 172 +++++++
 docs/kubernetes/mailu/fetchmail.yaml          |  39 ++
 docs/kubernetes/mailu/front.yaml              | 135 ++++++
 docs/kubernetes/mailu/imap.yaml               |  80 ++++
 docs/kubernetes/mailu/index.rst               | 193 ++++++++
 docs/kubernetes/mailu/pvc.yaml                |  27 ++
 docs/kubernetes/mailu/rbac.yaml               |   4 +
 docs/kubernetes/mailu/redis.yaml              |  56 +++
 docs/kubernetes/mailu/security-ingress.yaml   |  30 ++
 docs/kubernetes/mailu/security.yaml           | 116 +++++
 docs/kubernetes/mailu/smtp.yaml               |  80 ++++
 docs/kubernetes/mailu/webdav-ingress.yaml     |  46 ++
 docs/kubernetes/mailu/webdav.yaml             |  63 +++
 docs/kubernetes/mailu/webmail-ingress.yaml    |  31 ++
 docs/kubernetes/mailu/webmail.yaml            |  59 +++
 .../nginx/default-http-backend.yaml           |  55 +++
 docs/kubernetes/nginx/nginx-ingress.yaml      | 127 ++++++
 docs/kubernetes/nginx/rbac.yaml               | 129 ++++++
 services/rspamd/conf/worker-controller.inc    |   4 +
 webmails/roundcube/Dockerfile                 |   6 +-
 32 files changed, 1611 insertions(+), 539 deletions(-)
 delete mode 100644 docs/kubernetes/index.rst
 delete mode 100644 docs/kubernetes/kubernetes-mailu.yaml
 delete mode 100644 docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
 create mode 100644 docs/kubernetes/mailu/admin-ingress.yaml
 create mode 100644 docs/kubernetes/mailu/admin.yaml
 create mode 100644 docs/kubernetes/mailu/configmap.yaml
 create mode 100644 docs/kubernetes/mailu/fetchmail.yaml
 create mode 100644 docs/kubernetes/mailu/front.yaml
 create mode 100644 docs/kubernetes/mailu/imap.yaml
 create mode 100644 docs/kubernetes/mailu/index.rst
 create mode 100644 docs/kubernetes/mailu/pvc.yaml
 create mode 100644 docs/kubernetes/mailu/rbac.yaml
 create mode 100644 docs/kubernetes/mailu/redis.yaml
 create mode 100644 docs/kubernetes/mailu/security-ingress.yaml
 create mode 100644 docs/kubernetes/mailu/security.yaml
 create mode 100644 docs/kubernetes/mailu/smtp.yaml
 create mode 100644 docs/kubernetes/mailu/webdav-ingress.yaml
 create mode 100644 docs/kubernetes/mailu/webdav.yaml
 create mode 100644 docs/kubernetes/mailu/webmail-ingress.yaml
 create mode 100644 docs/kubernetes/mailu/webmail.yaml
 create mode 100644 docs/kubernetes/nginx/default-http-backend.yaml
 create mode 100644 docs/kubernetes/nginx/nginx-ingress.yaml
 create mode 100644 docs/kubernetes/nginx/rbac.yaml

diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index cacfe354..29957921 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.7
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk add --no-cache \
@@ -11,4 +11,4 @@ COPY start.py /start.py
 
 EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
 
-CMD /start.py
+CMD /start.py
\ No newline at end of file
diff --git a/core/nginx/Dockerfile b/core/nginx/Dockerfile
index 3be4b50f..49627fb7 100644
--- a/core/nginx/Dockerfile
+++ b/core/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:edge
+FROM alpine:3.7
 
 RUN apk add --no-cache nginx nginx-mod-mail python py-jinja2 certbot openssl
 
@@ -7,4 +7,4 @@ COPY *.py /
 
 EXPOSE 80/tcp 443/tcp 110/tcp 143/tcp 465/tcp 587/tcp 993/tcp 995/tcp 25/tcp 10025/tcp 10143/tcp
 
-CMD /start.py
+CMD /start.py
\ No newline at end of file
diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 8fcda1c3..b6e0fbd3 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -34,6 +34,8 @@ http {
       ''      $scheme;
     }
 
+    # Disable the main http server when on kubernetes (port 80 and 443)
+    {% if KUBERNETES_INGRESS != 'true' %}
     # Main HTTP server
     server {
       # Variables for proxifying
@@ -147,6 +149,7 @@ http {
         proxy_set_header Content-Length "";
       }
     }
+    {% endif %}
 
     # Forwarding authentication server
     server {
diff --git a/core/postfix/Dockerfile b/core/postfix/Dockerfile
index bb5831a2..168f3c60 100644
--- a/core/postfix/Dockerfile
+++ b/core/postfix/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine
+FROM alpine:3.7
 
 RUN apk add --no-cache postfix postfix-sqlite postfix-pcre rsyslog python py-jinja2
 
diff --git a/core/postfix/conf/main.cf b/core/postfix/conf/main.cf
index 2f2c6990..c1d5e4b2 100644
--- a/core/postfix/conf/main.cf
+++ b/core/postfix/conf/main.cf
@@ -32,7 +32,7 @@ relayhost = {{ RELAYHOST }}
 recipient_delimiter = {{ RECIPIENT_DELIMITER }}
 
 # Only the front server is allowed to perform xclient
-smtpd_authorized_xclient_hosts={{ FRONT_ADDRESS }}
+smtpd_authorized_xclient_hosts={{ RELAYNETS }}
 
 ###############
 # TLS
diff --git a/docs/compose/.env b/docs/compose/.env
index 06038bc8..e7a1f55d 100644
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -55,6 +55,9 @@ WEBDAV=none
 # Antivirus solution (value: clamav, none)
 ANTIVIRUS=none
 
+# The password for the rspamd web interface
+RSPAMD_PASSWORD=Secr3tPassWord
+
 ###################################
 # Mail settings
 ###################################
diff --git a/docs/index.rst b/docs/index.rst
index 0920bb96..ebfbd7a7 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -55,7 +55,7 @@ the version of Mailu that you are running.
     configuration
     compose/requirements
     compose/setup
-    kubernetes/index
+    kubernetes/mailu/index
     dns
     reverse
 
diff --git a/docs/kubernetes/index.rst b/docs/kubernetes/index.rst
deleted file mode 100644
index efd1ab7c..00000000
--- a/docs/kubernetes/index.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-Kubernetes setup
-================
-
-Please note that Kubernetes setup is not yet well supported or documented, all
-tests currently run on Docker Compose. The configuration has not yet been updated
-to work properly with ngin authentication proxy.
-
-Prepare the environment
------------------------
-
-The resource configurations in this folder assume that you have `Kubernetes Ingress`_
-set up for your cluster. If you are not using the `NGINX Ingress Controller for Kubernetes`_,
-please ensure that the configuration specified in the file matches your set up.
-
-.. _`Kubernetes Ingress`: https://kubernetes.io/docs/concepts/services-networking/ingress/
-.. _`NGINX Ingress Controller for Kubernetes`: https://github.com/kubernetes/ingress/tree/master/controllers/nginx
-
-Setup the Kubernetes service
-----------------------------
-
-Using the resource configurations is simple:
-
-1. ``kubectl apply -f kubernetes-nginx-ingress-controller.yaml`` to configure an ingress controller with the proper settings. (If you have one set up already you may need to port the configuration to your own ingress).
-2. ``kubectl apply -f kubernetes-mailu.yaml`` to create the resources required to run Mailu.
-
-Based on the configuration, your Mailu instance should be available at ``mail.<hostname>.tld/admin`` (note that visiting just ``mail.<hostname>.tld`` will likely result in a 404 error).
diff --git a/docs/kubernetes/kubernetes-mailu.yaml b/docs/kubernetes/kubernetes-mailu.yaml
deleted file mode 100644
index a7bafccd..00000000
--- a/docs/kubernetes/kubernetes-mailu.yaml
+++ /dev/null
@@ -1,419 +0,0 @@
----
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: mailu-admin-ing
-  labels:
-    app: mailu
-    role: mail
-    tier: backend
-spec:
-  tls:
-  - hosts:
-    - "mail.example.com"
-    secretName: letsencrypt-certs-all # If unsure how to generate these, check out https://github.com/ployst/docker-letsencrypt
-  rules:
-  - host: "mail.example.com"
-    http:
-      paths:
-      - path: "/admin"
-        backend:
-          serviceName: mailu-admin
-          servicePort: 80
-
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-redis
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-redis
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: redis
-        image: redis:4.0-alpine
-        imagePullPolicy: Always
-        volumeMounts:
-          - mountPath: /data
-            name: redisdata
-        ports:
-          - containerPort: 6379
-            name: redis
-            protocol: TCP
-      volumes:
-        - name: redisdata
-          hostPath:
-            path: /var/data/mailu/redisdata
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-  labels:
-    app: mailu-redis
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu
-    role: mail
-    tier: backend
-  ports:
-  - name: redis
-    port: 6379
-    protocol: TCP
-
----
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-imap
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-imap
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: imap
-        image: mailu/dovecot:stable
-        imagePullPolicy: Always
-        env:
-          - name  : DOMAIN
-            value : example.com
-          - name  : HOSTNAME
-            value : mail.example.com
-          - name  : POSTMASTER
-            value : admin
-        volumeMounts:
-          - mountPath: /data
-            name: maildata
-          - mountPath: /mail
-            name: mailstate
-          - mountPath: /overrides
-            name: overrides
-          - mountPath: /certs
-            name: certs
-            readOnly: true
-        ports:
-          - containerPort: 2102
-          - containerPort: 2525
-          - containerPort: 143
-          - containerPort: 993
-          - containerPort: 4190
-      volumes:
-        - name: maildata
-          hostPath:
-            path: /var/data/mailu/maildata
-        - name: mailstate
-          hostPath:
-            path: /var/data/mailu/mailstate
-        - name: overrides
-          hostPath:
-            path: /var/data/mailu/overrides
-        - name: certs
-          secret:
-            items:
-              - key: tls.crt
-                path: cert.pem
-              - key: tls.key
-                path: key.pem
-            secretName: letsencrypt-certs-all
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: imap
-  labels:
-    app: mailu
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-imap
-    role: mail
-    tier: backend
-  ports:
-  ports:
-  - name: imap-auth
-    port: 2102
-    protocol: TCP
-  - name: imap-transport
-    port: 2525
-    protocol: TCP
-  - name: imap-default
-    port: 143
-    protocol: TCP
-  - name: imap-ssl
-    port: 993
-    protocol: TCP
-  - name: sieve
-    port: 4190
-    protocol: TCP
-
----
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-smtp
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-smtp
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: smtp
-        image: mailu/postfix:stable
-        imagePullPolicy: Always
-        env:
-          - name  : DOMAIN
-            value : example.com
-          - name  : HOSTNAME
-            value : mail.example.com
-          - name  : MESSAGE_SIZE_LIMIT
-            value : "50000000"
-          - name  : RELAYHOST
-            value : ""
-        volumeMounts:
-          - mountPath: /data
-            name: maildata
-          - mountPath: /overrides
-            name: overrides
-          - mountPath: /certs
-            name: certs
-            readOnly: true
-        ports:
-          - name: smtp
-            containerPort: 25
-            protocol: TCP
-          - name: smtp-ssl
-            containerPort: 465
-            protocol: TCP
-          - name: smtp-starttls
-            containerPort: 587
-            protocol: TCP
-      volumes:
-        - name: maildata
-          hostPath:
-            path: /var/data/mailu/maildata
-        - name: overrides
-          hostPath:
-            path: /var/data/mailu/overrides
-        - name: certs
-          secret:
-            items:
-              - key: tls.crt
-                path: cert.pem
-              - key: tls.key
-                path: key.pem
-            secretName: letsencrypt-certs-all
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: smtp
-  labels:
-    app: mailu
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-smtp
-    role: mail
-    tier: backend
-  ports:
-  - name: smtp
-    port: 25
-    protocol: TCP
-  - name: smtp-ssl
-    port: 465
-    protocol: TCP
-  - name: smtp-starttls
-    port: 587
-    protocol: TCP
-
----
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-security
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-security
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: antispam
-        image: mailu/rspamd:stable
-        imagePullPolicy: Always
-        ports:
-          - name: antispam
-            containerPort: 11333
-            protocol: TCP
-        volumeMounts:
-          - name: filter
-            mountPath: /var/lib/rspamd
-      - name: antivirus
-        image: mailu/clamav:stable
-        imagePullPolicy: Always
-        ports:
-          - name: antivirus
-            containerPort: 3310
-            protocol: TCP
-        volumeMounts:
-          - name: filter
-            mountPath: /data
-      volumes:
-        - name: filter
-          hostPath:
-            path: /var/data/mailu/filter
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: antispam
-  labels:
-    app: mailu-antispam
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-security
-    role: mail
-    tier: backend
-  ports:
-  - name: antispam
-    port: 11333
-    protocol: TCP
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: antivirus
-  labels:
-    app: mailu-antivirus
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-security
-    role: mail
-    tier: backend
-  ports:
-  - name: antivirus
-    port: 3310
-    protocol: TCP
-
----
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-admin
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-admin
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: admin
-        image: mailu/admin:stable
-        imagePullPolicy: Always
-        env:
-          - name  : DOMAIN
-            value : example.com
-          - name  : HOSTNAME
-            value : mail.example.com
-          - name  : POSTMASTER
-            value : core
-          - name  : SECRET_KEY
-            value : pleasereplacethiswithabetterkey
-          - name  : DEBUG
-            value : "True"
-        volumeMounts:
-          - name: maildata
-            mountPath: /data
-          - name: dkim
-            mountPath: /dkim
-          - name: certs
-            mountPath: /certs
-            readOnly: true
-          # - name: docker
-          #   mountPath: /var/run/docker.sock
-          #   readOnly: true
-        ports:
-          - name: http
-            containerPort: 80
-            protocol: TCP
-      volumes:
-        - name: maildata
-          hostPath:
-            path: /var/data/mailu/maildata
-        - name: dkim
-          hostPath:
-            path: /var/data/mailu/dkim
-        - name: certs
-          secret:
-            items:
-              - key: tls.crt
-                path: cert.pem
-              - key: tls.key
-                path: key.pem
-            secretName: letsencrypt-certs-all
-        # - name: docker
-        #   hostPath:
-        #     path: /var/run/docker.sock
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: mailu-admin
-  labels:
-    app: mailu-admin
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-admin
-    role: mail
-    tier: backend
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
diff --git a/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml b/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
deleted file mode 100644
index 5ea9790a..00000000
--- a/docs/kubernetes/kubernetes-nginx-ingress-controller.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: nginx-configuration
-  namespace: ingress-nginx
-  labels:
-    app: ingress-nginx
-
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: udp-services
-  namespace: ingress-nginx
-
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tcp-services
-  namespace: ingress-nginx
-data:
-  25: "mailu/smtp:25"
-  465: "mailu/smtp:465"
-  587: "mailu/smtp:587"
-  143: "mailu/imap:143"
-  993: "mailu/imap:993"
-
----
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-ingress-controller
-  namespace: kube-system
-  labels:
-    k8s-app: nginx-ingress-controller
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        k8s-app: nginx-ingress-controller
-      annotations:
-        prometheus.io/port: '10254'
-        prometheus.io/scrape: 'true'
-    spec:
-      # hostNetwork makes it possible to use ipv6 and to preserve the source IP correctly regardless of docker configuration
-      # however, it is not a hard dependency of the nginx-ingress-controller itself and it may cause issues if port 10254 already is taken on the host
-      # that said, since hostPort is broken on CNI (https://github.com/kubernetes/kubernetes/issues/31307) we have to use hostNetwork where CNI is used
-      # like with kubeadm
-      # hostNetwork: true
-      terminationGracePeriodSeconds: 60
-      containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.11.0
-        name: nginx-ingress-controller
-        args:
-          - /nginx-ingress-controller
-          - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
-          - --configmap=$(POD_NAMESPACE)/nginx-configuration
-          - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
-          - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
-          - --annotations-prefix=nginx.ingress.kubernetes.io
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 10254
-            scheme: HTTP
-          initialDelaySeconds: 10
-          timeoutSeconds: 1
-        env:
-          - name: POD_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.name
-          - name: POD_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
diff --git a/docs/kubernetes/mailu/admin-ingress.yaml b/docs/kubernetes/mailu/admin-ingress.yaml
new file mode 100644
index 00000000..72aafa68
--- /dev/null
+++ b/docs/kubernetes/mailu/admin-ingress.yaml
@@ -0,0 +1,86 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: mailu-admin-ingress
+  namespace: mailu-mailserver
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
+    certmanager.k8s.io/cluster-issuer: letsencrypt-stage
+    ingress.kubernetes.io/permanent-redirect: "https://mail.example.com/admin/ui/"
+    ingress.kubernetes.io/follow-redirects: "true"
+  labels:
+    app: mailu
+    role: mail
+    tier: backend
+spec:
+  tls:
+  - hosts:
+    - "mail.example.com"
+    secretName: letsencrypt-certs-all # If unsure how to generate these, check out https://github.com/ployst/docker-letsencrypt
+  rules:
+  - host: "mail.example.com"
+    http:
+      paths:
+      - path: "/admin"
+        backend:
+          serviceName: admin
+          servicePort: 80
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: mailu-admin-ui-ingress
+  namespace: mailu-mailserver
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    certmanager.k8s.io/cluster-issuer: letsencrypt-stage
+    ingress.kubernetes.io/rewrite-target: "/ui"
+    ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header X-Forwarded-Prefix /admin;
+  labels:
+    app: mailu
+    role: mail
+    tier: backend
+spec:
+  tls:
+  - hosts:
+    - "mail.example.com"
+    secretName: letsencrypt-certs-all # If unsure how to generate these, check out https://github.com/ployst/docker-letsencrypt
+  rules:
+  - host: "mail.example.com"
+    http:
+      paths:
+      - path: "/admin/ui"
+        backend:
+          serviceName: admin
+          servicePort: 80
+---
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: mailu-admin-static-ingress
+  namespace: mailu-mailserver
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    certmanager.k8s.io/cluster-issuer: letsencrypt-stage
+    ingress.kubernetes.io/rewrite-target: "/static"
+    ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header X-Forwarded-Prefix /admin;
+  labels:
+    app: mailu
+    role: mail
+    tier: backend
+spec:
+  tls:
+  - hosts:
+    - "mail.example.com"
+    secretName: letsencrypt-certs-all # If unsure how to generate these, check out https://github.com/ployst/docker-letsencrypt
+  rules:
+  - host: "mail.example.com"
+    http:
+      paths:
+      - path: "/admin/static"
+        backend:
+          serviceName: admin
+          servicePort: 80
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/admin.yaml b/docs/kubernetes/mailu/admin.yaml
new file mode 100644
index 00000000..435b7975
--- /dev/null
+++ b/docs/kubernetes/mailu/admin.yaml
@@ -0,0 +1,63 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mailu-admin
+  namespace: mailu-mailserver
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mailu-admin
+        role: mail
+        tier: backend
+    spec:
+      containers:
+      - name: admin
+        image: mailu/admin:master
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        volumeMounts:
+          - name: maildata
+            mountPath: /data
+            subPath: maildata
+          - name: maildata
+            mountPath: /dkim
+            subPath: dkim
+        ports:
+          - name: http
+            containerPort: 80
+            protocol: TCP
+        resources:
+          requests:
+            memory: 500Mi
+            cpu: 500m
+          limits:
+            memory: 500Mi
+            cpu: 500m
+      volumes:
+        - name: maildata
+          persistentVolumeClaim:
+            claimName: mail-storage
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: admin
+  namespace: mailu-mailserver
+  labels:
+    app: mailu-admin
+    role: mail
+    tier: backend
+spec:
+  selector:
+    app: mailu-admin
+    role: mail
+    tier: backend
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/configmap.yaml b/docs/kubernetes/mailu/configmap.yaml
new file mode 100644
index 00000000..be39fcc9
--- /dev/null
+++ b/docs/kubernetes/mailu/configmap.yaml
@@ -0,0 +1,172 @@
+   apiVersion: v1
+   kind: ConfigMap
+   metadata:
+     name: mailu-config
+     namespace: mailu-mailserver
+   data:
+    # Mailu main configuration file
+    #
+    # Most configuration variables can be modified through the Web interface,
+    # these few settings must however be configured before starting the mail
+    # server and require a restart upon change.
+
+    ###################################
+    # Common configuration variables
+    ###################################
+
+    # Set this to the path where Mailu data and configuration is stored
+    ROOT: "/mailu"
+
+    # Mailu version to run (1.0, 1.1, etc. or master)
+    VERSION: "master"
+
+    # Set to a randomly generated 16 bytes string
+    SECRET_KEY: "MySup3rS3cr3tPas"
+
+    # Address where listening ports should bind
+    BIND_ADDRESS4: "127.0.0.1"
+    #BIND_ADDRESS6: "::1"
+
+    # Main mail domain
+    DOMAIN: "example.com"
+
+    # Hostnames for this server, separated with comas
+    HOSTNAMES: "mail.example.com"
+
+    # Postmaster local part (will append the main mail domain)
+    POSTMASTER: "admin"
+
+    # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
+    TLS_FLAVOR: "cert"
+
+    # Authentication rate limit (per source IP address)
+    AUTH_RATELIMIT: "100/minute;10000/hour"
+
+    # Opt-out of statistics, replace with "True" to opt out
+    DISABLE_STATISTICS: "False"
+
+    ###################################
+    # Kubernetes configuration
+    ###################################
+
+    # Use Kubernetes Ingress Controller to handle all actions on port 80 and 443
+    # This way we can make use of the advantages of the cert-manager deployment
+    KUBERNETES_INGRESS: "true"
+    POD_ADDRESS_RANGE: "10.2.0.0/16"
+
+    ###################################
+    # Optional features
+    ###################################
+
+    # Expose the admin interface (value: true, false)
+    ADMIN: "true"
+    # Run the admin interface in debug mode
+    #DEBUG: "True"
+
+    # Choose which webmail to run if any (values: roundcube, rainloop, none)
+    WEBMAIL: "roundcube"
+
+    # Dav server implementation (value: radicale, none)
+    WEBDAV: "radicale"
+
+    # Antivirus solution (value: clamav, none)
+    ANTIVIRUS: "clamav"
+
+    # The password for the rspamd web interface
+    RSPAMD_PASSWORD: "Secr3tPassWord"
+
+    ###################################
+    # Mail settings
+    ###################################
+
+    # Message size limit in bytes
+    # Default: accept messages up to 50MB
+    MESSAGE_SIZE_LIMIT: "50000000"
+
+    # Networks granted relay permissions, make sure that you include your Docker
+    # internal network (default to 172.17.0.0/16)
+    # For kubernetes this is the CIDR of the pod network
+    RELAYNETS: "10.2.0.0/16"
+
+    # Will relay all outgoing mails if configured
+    #RELAYHOST=
+
+    # This part is needed for the XCLIENT login for postfix. This should be the POD ADDRESS range
+    FRONT_ADDRESS: "front.mailu-mailserver.svc.cluster.local"
+
+    # This value  is needed by the webmail to find the correct imap backend
+    IMAP_ADDRESS: "imap.mailu-mailserver.svc.cluster.local"
+
+    # This value is used by Dovecot to find the Redis server in the cluster
+    REDIS_ADDRESS: "redis.mailu-mailserver.svc.cluster.local"
+
+    # Fetchmail delay
+    FETCHMAIL_DELAY: "600"
+
+    # Recipient delimiter, character used to delimiter localpart from custom address part
+    # e.g. localpart+custom@domain;tld
+    RECIPIENT_DELIMITER: "+"
+
+    # DMARC rua and ruf email
+    DMARC_RUA: "root"
+    DMARC_RUF: "root"
+
+    # Welcome email, enable and set a topic and body if you wish to send welcome
+    # emails to all users.
+    WELCOME: "false"
+    WELCOME_SUBJECT: "Welcome to your new email account"
+    WELCOME_BODY: "Welcome to your new email account, if you can read this, then it is configured properly!"
+
+    ###################################
+    # Web settings
+    ###################################
+
+    # Path to the admin interface if enabled
+    # Kubernetes addition: You need to change ALL the ingresses, when you want this URL to be different!!!
+    WEB_ADMIN: "/admin"
+
+    # Path to the webmail if enabled
+    # Currently, this is not used, because we intended to use a different subdomain: webmail.example.com
+    # This option can be added in a feature release
+    WEB_WEBMAIL: "/webmail"
+
+    # Website name
+    SITENAME: "Mailu"
+
+    # Linked Website URL
+    WEBSITE: "https://example.com"
+
+    # Registration reCaptcha settings (warning, this has some privacy impact)
+    # RECAPTCHA_PUBLIC_KEY=
+    # RECAPTCHA_PRIVATE_KEY=
+
+    # Domain registration, uncomment to enable
+    # DOMAIN_REGISTRATION=true
+
+    ###################################
+    # Advanced settings
+    ###################################
+
+    # Docker-compose project name, this will prepended to containers names.
+    COMPOSE_PROJECT_NAME: "mailu"
+
+    # Default password scheme used for newly created accounts and changed passwords
+    # (value: SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
+    PASSWORD_SCHEME: "SHA512-CRYPT"
+
+    # Header to take the real ip from
+    #REAL_IP_HEADER:
+
+    # IPs for nginx set_real_ip_from (CIDR list separated by commas)
+    #REAL_IP_FROM:
+
+    # Host settings
+    HOST_IMAP: "imap.mailu-mailserver.svc.cluster.local"
+    HOST_POP3: "imap.mailu-mailserver.svc.cluster.local"
+    HOST_SMTP: "smtp.mailu-mailserver.svc.cluster.local"
+    HOST_AUTHSMTP: "smtp.mailu-mailserver.svc.cluster.local"
+    HOST_WEBMAIL: "webmail.mailu-mailserver.svc.cluster.local"
+    HOST_ADMIN: "admin.mailu-mailserver.svc.cluster.local"
+    HOST_WEBDAV: "webdav.mailu-mailserver.svc.cluster.local:5232"
+    HOST_ANTISPAM: "antispam.mailu-mailserver.svc.cluster.local:11332"
+    HOST_REDIS: "redis.mailu-mailserver.svc.cluster.local"
diff --git a/docs/kubernetes/mailu/fetchmail.yaml b/docs/kubernetes/mailu/fetchmail.yaml
new file mode 100644
index 00000000..cf3271e7
--- /dev/null
+++ b/docs/kubernetes/mailu/fetchmail.yaml
@@ -0,0 +1,39 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mailu-fetchmail
+  namespace: mailu-mailserver
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mailu-fetchmail
+        role: mail
+        tier: backend
+    spec:
+      containers:
+      - name: fetchmail
+        image: mailu/fetchmail:master
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        volumeMounts:
+          - name: maildata
+            mountPath: /data
+            subPath: maildata
+        ports:
+          - containerPort: 5232
+          - containerPort: 80
+        resources:
+          requests:
+            memory: 100Mi
+            cpu: 100m
+          limits:
+            memory: 100Mi
+            cpu: 100m
+      volumes:
+        - name: maildata
+          persistentVolumeClaim:
+            claimName: mail-storage
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/front.yaml b/docs/kubernetes/mailu/front.yaml
new file mode 100644
index 00000000..c13ecd9d
--- /dev/null
+++ b/docs/kubernetes/mailu/front.yaml
@@ -0,0 +1,135 @@
+apiVersion: apps/v1beta2
+kind: DaemonSet
+metadata:
+  name: mailu-front
+  namespace: mailu-mailserver
+  labels:
+    k8s-app: mail-loadbalancer
+    component: ingress-controller
+    type: nginx
+spec:
+  selector:
+    matchLabels:
+      k8s-app: mail-loadbalancer
+      component: ingress-controller
+      type: nginx
+  template:
+    metadata:
+      labels:
+        k8s-app: mail-loadbalancer
+        component: ingress-controller
+        type: nginx
+    spec:
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/master
+                operator: DoesNotExist
+      hostNetwork: true
+      nodeSelector:
+        node-role.kubernetes.io/node: ""
+      dnsPolicy: ClusterFirstWithHostNet
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 60
+      containers:
+      - name: front
+        image: mailu/nginx:master
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        volumeMounts:
+          - name: certs
+            mountPath: /certs
+        ports:
+          - name: pop3
+            containerPort: 110
+            protocol: TCP
+          - name: pop3s
+            containerPort: 995
+            protocol: TCP
+          - name: imap
+            containerPort: 143
+            protocol: TCP
+          - name: imaps
+            containerPort: 993
+            protocol: TCP
+          - name: smtp
+            containerPort: 25
+            protocol: TCP
+          - name: smtp-auth
+            containerPort: 10025
+            protocol: TCP
+          - name: imap-auth
+            containerPort: 10143
+            protocol: TCP
+          - name: smtps
+            containerPort: 465
+            protocol: TCP
+          - name: smtpd
+            containerPort: 587
+            protocol: TCP
+          - name: auth
+            containerPort: 8000
+            protocol: TCP
+        resources:
+          requests:
+            memory: 100Mi
+            cpu: 100m
+          limits:
+            memory: 200Mi
+            cpu: 200m
+      volumes:
+        - name: certs
+          secret:
+            items:
+              - key: tls.crt
+                path: cert.pem
+              - key: tls.key
+                path: key.pem
+            secretName: letsencrypt-certs-all
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: front
+  namespace: mailu-mailserver
+  labels:
+    k8s-app: mail-loadbalancer
+    component: ingress-controller
+    type: nginx
+spec:
+  selector:
+    k8s-app: mail-loadbalancer
+    component: ingress-controller
+    type: nginx
+  ports:
+  - name: pop3
+    port: 110
+    protocol: TCP
+  - name: pop3s
+    port: 995
+    protocol: TCP
+  - name: imap
+    port: 143
+    protocol: TCP
+  - name: imaps
+    port: 993
+    protocol: TCP
+  - name: smtp
+    port: 25
+    protocol: TCP
+  - name: smtps
+    port: 465
+    protocol: TCP
+  - name: smtpd
+    port: 587
+    protocol: TCP
+  - name: smtp-auth
+    port: 10025
+    protocol: TCP
+  - name: imap-auth
+    port: 10143
+    protocol: TCP
diff --git a/docs/kubernetes/mailu/imap.yaml b/docs/kubernetes/mailu/imap.yaml
new file mode 100644
index 00000000..37f4899e
--- /dev/null
+++ b/docs/kubernetes/mailu/imap.yaml
@@ -0,0 +1,80 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mailu-imap
+  namespace: mailu-mailserver
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mailu-imap
+        role: mail
+        tier: backend
+    spec:
+      containers:
+      - name: imap
+        image: mailu/dovecot:master
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        volumeMounts:
+          - mountPath: /data
+            name: maildata
+            subPath: maildata
+          - mountPath: /mail
+            name: maildata
+            subPath: mailstate
+          - mountPath: /overrides
+            name: maildata
+            subPath: overrides
+        ports:
+          - containerPort: 2102
+          - containerPort: 2525
+          - containerPort: 143
+          - containerPort: 993
+          - containerPort: 4190
+        resources:
+          requests:
+            memory: 1Gi
+            cpu: 1000m
+          limits:
+            memory: 1Gi
+            cpu: 1000m
+      volumes:
+        - name: maildata
+          persistentVolumeClaim:
+            claimName: mail-storage
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: imap
+  namespace: mailu-mailserver
+  labels:
+    app: mailu
+    role: mail
+    tier: backend
+spec:
+  selector:
+    app: mailu-imap
+    role: mail
+    tier: backend
+  ports:
+  ports:
+  - name: imap-auth
+    port: 2102
+    protocol: TCP
+  - name: imap-transport
+    port: 2525
+    protocol: TCP
+  - name: imap-default
+    port: 143
+    protocol: TCP
+  - name: imap-ssl
+    port: 993
+    protocol: TCP
+  - name: sieve
+    port: 4190
+    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/index.rst b/docs/kubernetes/mailu/index.rst
new file mode 100644
index 00000000..ef12eb58
--- /dev/null
+++ b/docs/kubernetes/mailu/index.rst
@@ -0,0 +1,193 @@
+Install Mailu master on kubernetes
+==================================
+
+Prequisites
+-----------
+
+Structure
+~~~~~~~~~
+
+There’s chosen to have a double NGINX stack for Mailu, this way the main
+ingress can still be used to access other websites/domains on your
+cluster. This is the current structure:
+
+-  ``NGINX Ingress controller``: Listens to the nodes ports 80 & 443. We have chosen to have a double NGINX stack for Mailu.
+-  ``Cert manager``: Creates automatic Lets Encrypt certificates based on an ``Ingress``-objects domain name.
+-  ``Mailu NGINX Front daemonset``: This daemonset runs in parallel with the Nginx Ingress Controller and only listens on all E-mail specific ports (25, 110, 143, 587,...)
+-  ``Mailu components``: All Mailu components (imap, smtp, security, webmail,...) are split into separate files to make them more handy to use, you can find the ``YAML`` files in this directory
+
+What you need
+~~~~~~~~~~~~~
+
+-  A working Kubernetes cluster (tested with 1.10.5)
+-  A working `cert-manager`_ installation
+-  A working nginx-ingress controller needed for the lets-encrypt
+   certificates. You can find those files in the ``nginx`` subfolder
+
+Cert manager
+^^^^^^^^^^^^
+
+The ``Cert-manager`` is quite easy to deploy using Helm when reading the
+`docs`_. After booting the ``Cert-manager`` you’ll need a
+``ClusterIssuer`` which takes care of all required certificates through
+``Ingress`` items. We chose to provide a ``clusterIssuer`` so you can provide SSL certificates
+for other namespaces (different websites/services), if you don't need this option, you can easily change this by
+changing ``clusterIssuer`` to ``Issuer`` and adding the ``namespace: mailu-mailserver`` to the metadata.
+An example of a production and a staging ``clusterIssuer``:
+
+.. code:: yaml
+
+   # This clusterIssuer example uses the staging environment for testing first
+   apiVersion: certmanager.k8s.io/v1alpha1
+   kind: ClusterIssuer
+   metadata:
+     name: letsencrypt-stage
+   spec:
+     acme:
+       email: something@example.com
+       http01: {}
+       privateKeySecretRef:
+         name: letsencrypt-stage
+       server: https://acme-staging-v02.api.letsencrypt.org/directory
+
+.. code:: yaml
+
+   # This clusterIssuer example uses the production environment
+   apiVersion: certmanager.k8s.io/v1alpha1
+   kind: ClusterIssuer
+   metadata:
+     name: letsencrypt-prod
+   spec:
+     acme:
+       email: something@example.com
+       http01: {}
+       privateKeySecretRef:
+         name: letsencrypt-prod
+       server: https://acme-v02.api.letsencrypt.org/directory
+
+**IMPORTANT**: All ``*-ingress.yaml`` files use the ``letsencrypt-stage`` ``clusterIssuer``. If you are ready for production,
+change this field in all ``*-ingress.yaml`` files to ``letsencrypt-prod`` or whatever name you chose for the production.
+If you choose for ``Issuer`` instead of ``clusterIssuer`` you also need to change the annotation to ``certmanager.k8s.io/issuer`` instead of ``certmanager.k8s.io/cluster-issuer``
+
+Deploying Mailu
+---------------
+
+All manifests can be found in the ``mailu`` subdirectory. All commands
+below need to be run from this subdirectory
+
+Personalization
+~~~~~~~~~~~~~~~
+
+-  All services run in the same namespace, currently ``mailu-mailserver``. So if you want to use a different one, change the ``namespace`` value in **every** file
+-  Check the ``storage-class`` field in the ``pvc.yaml`` file, you can also change the sizes to your liking. Note that you need ``RWX`` (read-write-many) and ``RWO`` (read-write-once) storageclasses.
+-  Check the ``configmap.yaml`` and adapt it to your needs. Be sure to check the kubernetes DNS values at the end (if you use a different namespace)
+-  Check the ``*-ingress.yaml`` files and change it to the domain you want (this is for the kubernetes ingress controller to handle the admin, webmail, webdav and auth connections)
+
+Installation
+------------
+
+Boot the Mailu components
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To start Mailu, run the following commands from the ``docs/kubernetes/mailu`` directory
+
+.. code-block:: bash
+
+    kubectl create -f rbac.yaml
+    kubectl create -f configmap.yaml
+    kubectl create -f pvc.yaml
+    kubectl create -f redis.yaml
+    kubectl create -f front.yaml
+    kubectl create -f webmail.yaml
+    kubectl create -f imap.yaml
+    kubectl create -f security.yaml
+    kubectl create -f smtp.yaml
+    kubectl create -f fetchmail.yaml
+    kubectl create -f admin.yaml
+    kubectl create -f webdav.yaml
+    kubectl create -f admin-ingress.yaml
+    kubectl create -f webdav-ingress.yaml
+    kubectl create -f security-ingress.yaml
+    kubectl create -f webmail-ingress.yaml
+
+
+Create the first admin account
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When the cluster is online you need to create you master user to access https://mail.example.com/admin
+Enter the main ``admin`` pod to create the root account:
+
+.. code-block:: bash
+
+    kubectl -n mailu-mailserver get po
+    kubectl -n mailu-mailserver exec -it mailu-admin-.... /bin/sh
+
+And in the pod run the following command. The command uses following entries:
+
+.. code-block:: bash
+
+    python manage.py admin root example.com password
+
+- ``admin`` Make it an admin user
+- ``root`` The first part of the e-mail adres (ROOT@example.com)
+- ``example.com`` the domain appendix
+- ``password`` the chosen password for the user
+
+
+Now you should be able to login on the mail account: https://mail.example.com/admin
+
+Adaptations
+-----------
+
+Dovecot
+~~~~~~~
+
+- If you are using Dovecot on a shared file system (Glusterfs, NFS,...), you need to create a special override otherwise a lot of indexing errors will occur on your Dovecot pod.
+- I also higher the number of max connections per IP. Now it's limited to 10.
+
+Enter the dovecot pod:
+
+.. code:: bash
+
+    kubectl -n mailu-mailserver get po
+    kubectl -n mailu-mailserver exec -it mailu-imap-.... /bin/sh
+
+Create the file ``overrides/dovecot.conf``
+
+.. code:: bash
+
+    vi /overrides/dovecot.conf
+
+And enter following contents:
+
+.. code:: bash
+
+    mail_nfs_index = yes
+    mail_nfs_storage = yes
+    mail_fsync = always
+    mmap_disable = yes
+    mail_max_userip_connections=100
+
+Save and close the file and delete the imap pod to get it recreated.
+
+.. code:: bash
+
+    kubectl -n mailu-mailserver delete po/mailu-imap-....
+
+Wait for the pod to recreate and you're online!
+Happy mailing!
+
+.. _here: https://github.com/hacor/Mailu/blob/master/core/postfix/conf/main.cf#L35
+.. _cert-manager: https://github.com/jetstack/cert-manager
+.. _docs: https://cert-manager.readthedocs.io/en/latest/getting-started/2-installing.html
+
+Imap login fix
+~~~~~~~~~~~~~~
+
+If it seems you're not able to login using IMAP on your Mailu accounts, check the logs of the imap container to see whether it's a permissions problem on the database.
+This problem can be easily fixed by running following commands:
+
+.. code:: bash
+
+    kubectl -n mailu-mailserver exec -it maolu-imap-... /bin/sh
+    chmod 777 /data/main.db
diff --git a/docs/kubernetes/mailu/pvc.yaml b/docs/kubernetes/mailu/pvc.yaml
new file mode 100644
index 00000000..0ec2852f
--- /dev/null
+++ b/docs/kubernetes/mailu/pvc.yaml
@@ -0,0 +1,27 @@
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: redis-hdd
+  namespace: mailu-mailserver
+  annotations:
+    volume.beta.kubernetes.io/storage-class: "glusterblock-hdd"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 1Gi
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: mail-storage
+  namespace: mailu-mailserver
+  annotations:
+    volume.beta.kubernetes.io/storage-class: "gluster-heketi-hdd"
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: 100Gi
diff --git a/docs/kubernetes/mailu/rbac.yaml b/docs/kubernetes/mailu/rbac.yaml
new file mode 100644
index 00000000..33255130
--- /dev/null
+++ b/docs/kubernetes/mailu/rbac.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: mailu-mailserver
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/redis.yaml b/docs/kubernetes/mailu/redis.yaml
new file mode 100644
index 00000000..d6bb1eb8
--- /dev/null
+++ b/docs/kubernetes/mailu/redis.yaml
@@ -0,0 +1,56 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mailu-redis
+  namespace: mailu-mailserver
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mailu-redis
+        role: mail
+        tier: backend
+    spec:
+      containers:
+      - name: redis
+        image: redis:4.0-alpine
+        imagePullPolicy: Always
+        volumeMounts:
+          - mountPath: /data
+            name: redisdata
+        ports:
+          - containerPort: 6379
+            name: redis
+            protocol: TCP
+        resources:
+          requests:
+            memory: 200Mi
+            cpu: 100m
+          limits:
+            memory: 300Mi
+            cpu: 200m
+      volumes:
+        - name: redisdata
+          persistentVolumeClaim:
+            claimName: redis-hdd
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: redis
+  namespace: mailu-mailserver
+  labels:
+    app: mailu-redis
+    role: mail
+    tier: backend
+spec:
+  selector:
+    app: mailu-redis
+    role: mail
+    tier: backend
+  ports:
+  - name: redis
+    port: 6379
+    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/security-ingress.yaml b/docs/kubernetes/mailu/security-ingress.yaml
new file mode 100644
index 00000000..74ced47e
--- /dev/null
+++ b/docs/kubernetes/mailu/security-ingress.yaml
@@ -0,0 +1,30 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: mailu-antispam-ingress
+  namespace: mailu-mailserver
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    certmanager.k8s.io/cluster-issuer: letsencrypt-stage
+    ingress.kubernetes.io/configuration-snippet: |
+      rewrite ^/admin/antispam/(.*) /$1 break;
+      auth_request /internal/auth/admin;
+      proxy_set_header X-Real-IP "";
+      proxy_set_header X-Forwarded-For "";
+  labels:
+    app: mailu
+    role: mail
+    tier: frontend
+spec:
+  tls:
+  - hosts:
+    - "mail.example.com"
+    secretName: letsencrypt-certs-all # If unsure how to generate these, check out https://github.com/ployst/docker-letsencrypt
+  rules:
+  - host: "mail.example.com"
+    http:
+      paths:
+      - path: "/admin/antispam"
+        backend:
+          serviceName: antispam
+          servicePort: 11334
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/security.yaml b/docs/kubernetes/mailu/security.yaml
new file mode 100644
index 00000000..80fde812
--- /dev/null
+++ b/docs/kubernetes/mailu/security.yaml
@@ -0,0 +1,116 @@
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mailu-security
+  namespace: mailu-mailserver
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mailu-security
+        role: mail
+        tier: backend
+    spec:
+      containers:
+      - name: antispam
+        image: mailu/rspamd:master
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        resources:
+          requests:
+            memory: 100Mi
+            cpu: 100m
+          limits:
+            memory: 200Mi
+            cpu: 200m
+        ports:
+          - name: antispam
+            containerPort: 11332
+            protocol: TCP
+          - name: antispam-http
+            containerPort: 11334
+            protocol: TCP
+        volumeMounts:
+          - name: filter
+            subPath: filter
+            mountPath: /var/lib/rspamd
+          - name: filter
+            mountPath: /dkim
+            subPath: dkim
+          - name: filter
+            mountPath: /etc/rspamd/override.d
+            subPath: rspamd-overrides
+      - name: antivirus
+        image: mailu/clamav:master
+        imagePullPolicy: Always
+        resources:
+          requests:
+            memory: 1Gi
+            cpu: 1000m
+          limits:
+            memory: 2Gi
+            cpu: 1000m
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        ports:
+          - name: antivirus
+            containerPort: 3310
+            protocol: TCP
+        volumeMounts:
+          - name: filter
+            subPath: filter
+            mountPath: /data
+      volumes:
+        - name: filter
+          persistentVolumeClaim:
+            claimName: mail-storage
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: antispam
+  namespace: mailu-mailserver
+  labels:
+    app: mailu-antispam
+    role: mail
+    tier: backend
+spec:
+  selector:
+    app: mailu-security
+    role: mail
+    tier: backend
+  ports:
+  - name: antispam
+    port: 11332
+    protocol: TCP
+  - name: antispam-http
+    protocol: TCP
+    port: 11334
+
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: antivirus
+  namespace: mailu-mailserver
+  labels:
+    app: mailu-antivirus
+    role: mail
+    tier: backend
+spec:
+  selector:
+    app: mailu-security
+    role: mail
+    tier: backend
+  ports:
+  - name: antivirus
+    port: 3310
+    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/smtp.yaml b/docs/kubernetes/mailu/smtp.yaml
new file mode 100644
index 00000000..926a2b7c
--- /dev/null
+++ b/docs/kubernetes/mailu/smtp.yaml
@@ -0,0 +1,80 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mailu-smtp
+  namespace: mailu-mailserver
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mailu-smtp
+        role: mail
+        tier: backend
+    spec:
+      containers:
+      - name: smtp
+        image: mailu/postfix:master
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        resources:
+          requests:
+            memory: 2Gi
+            cpu: 500m
+          limits:
+            memory: 2Gi
+            cpu: 500m
+        volumeMounts:
+          - mountPath: /data
+            name: maildata
+            subPath: maildata
+          - mountPath: /overrides
+            name: maildata
+            subPath: overrides
+        ports:
+          - name: smtp
+            containerPort: 25
+            protocol: TCP
+          - name: smtp-ssl
+            containerPort: 465
+            protocol: TCP
+          - name: smtp-starttls
+            containerPort: 587
+            protocol: TCP
+          - name: smtp-auth
+            containerPort: 10025
+            protocol: TCP
+      volumes:
+        - name: maildata
+          persistentVolumeClaim:
+            claimName: mail-storage
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: smtp
+  namespace: mailu-mailserver
+  labels:
+    app: mailu
+    role: mail
+    tier: backend
+spec:
+  selector:
+    app: mailu-smtp
+    role: mail
+    tier: backend
+  ports:
+  - name: smtp
+    port: 25
+    protocol: TCP
+  - name: smtp-ssl
+    port: 465
+    protocol: TCP
+  - name: smtp-starttls
+    port: 587
+    protocol: TCP
+  - name: smtp-auth
+    port: 10025
+    protocol: TCP
diff --git a/docs/kubernetes/mailu/webdav-ingress.yaml b/docs/kubernetes/mailu/webdav-ingress.yaml
new file mode 100644
index 00000000..3498eb02
--- /dev/null
+++ b/docs/kubernetes/mailu/webdav-ingress.yaml
@@ -0,0 +1,46 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: mailu-webdav-ingress
+  namespace: mailu-mailserver
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
+    certmanager.k8s.io/cluster-issuer: letsencrypt-stage
+    #ingress.kubernetes.io/auth-url: http://admin.mailu-mailserver.svc.cluster.local/internal/auth/basic
+    ingress.kubernetes.io/configuration-snippet: |
+      rewrite ^/webdav/(.*) /$1 break;
+      auth_request /internal/auth/basic;
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      auth_request_set $user $upstream_http_x_user;
+      proxy_set_header X-Remote-User $user;
+      proxy_set_header X-Script-Name /webdav;
+    ingress.kubernetes.io/server-snippet: |
+      location /internal {
+        internal;
+
+        proxy_set_header Authorization $http_authorization;
+        proxy_pass_header Authorization;
+        proxy_pass http://admin.mailu-mailserver.svc.cluster.local;
+        proxy_pass_request_body off;
+        proxy_set_header Content-Length "";
+      }
+  labels:
+    app: mailu
+    role: mail
+    tier: frontend
+spec:
+  tls:
+  - hosts:
+    - "mail.example.com"
+    secretName: letsencrypt-certs-all # If unsure how to generate these, check out https://github.com/ployst/docker-letsencrypt
+  rules:
+  - host: "mail.example.com"
+    http:
+      paths:
+      - path: "/webdav"
+        backend:
+          serviceName: webdav
+          servicePort: 5232
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/webdav.yaml b/docs/kubernetes/mailu/webdav.yaml
new file mode 100644
index 00000000..07b7733c
--- /dev/null
+++ b/docs/kubernetes/mailu/webdav.yaml
@@ -0,0 +1,63 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mailu-webdav
+  namespace: mailu-mailserver
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mailu-webdav
+        role: mail
+        tier: backend
+    spec:
+      containers:
+      - name: radicale
+        image: mailu/radicale:master
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        volumeMounts:
+          - mountPath: /data
+            name: maildata
+            subPath: dav
+        ports:
+          - containerPort: 5232
+          - containerPort: 80
+        resources:
+          requests:
+            memory: 100Mi
+            cpu: 100m
+          limits:
+            memory: 100Mi
+            cpu: 100m
+      volumes:
+        - name: maildata
+          persistentVolumeClaim:
+            claimName: mail-storage
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: webdav
+  namespace: mailu-mailserver
+  labels:
+    app: mailu-webdav
+    role: mail
+    tier: backend
+spec:
+  selector:
+    app: mailu-webdav
+    role: mail
+    tier: backend
+  ports:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
+  - name: http-ui
+    port: 5232
+    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/webmail-ingress.yaml b/docs/kubernetes/mailu/webmail-ingress.yaml
new file mode 100644
index 00000000..40655ca2
--- /dev/null
+++ b/docs/kubernetes/mailu/webmail-ingress.yaml
@@ -0,0 +1,31 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: mailu-webmail-ingress
+  namespace: mailu-mailserver
+  annotations:
+    kubernetes.io/tls-acme: "true"
+    nginx.ingress.kubernetes.io/proxy-body-size: "0"
+    certmanager.k8s.io/cluster-issuer: letsencrypt-stage
+    nginx.ingress.kubernetes.io/configuration-snippet: |
+      proxy_set_header Host $http_host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+      proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
+  labels:
+    app: mailu
+    role: mail
+    tier: backend
+spec:
+  tls:
+  - hosts:
+    - "webmail.example.com"
+    secretName: letsencrypt-webmail # If unsure how to generate these, check out https://github.com/ployst/docker-letsencrypt
+  rules:
+    - host: "webmail.example.com"
+      http:
+        paths:
+        - path: "/"
+          backend:
+            serviceName: webmail
+            servicePort: 80
\ No newline at end of file
diff --git a/docs/kubernetes/mailu/webmail.yaml b/docs/kubernetes/mailu/webmail.yaml
new file mode 100644
index 00000000..bbbeb09d
--- /dev/null
+++ b/docs/kubernetes/mailu/webmail.yaml
@@ -0,0 +1,59 @@
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: mailu-roundcube
+  namespace: mailu-mailserver
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: mailu-roundcube
+        role: mail
+        tier: frontend
+    spec:
+      containers:
+      - name: roundcube
+        image: mailu/roundcube:master
+        imagePullPolicy: Always
+        envFrom:
+          - configMapRef:
+              name: mailu-config
+        resources:
+          requests:
+            memory: 100Mi
+            cpu: 100m
+          limits:
+            memory: 200Mi
+            cpu: 200m
+        volumeMounts:
+          - mountPath: /data
+            name: maildata
+            subPath: webmail
+        ports:
+          - containerPort: 80
+      volumes:
+        - name: maildata
+          persistentVolumeClaim:
+            claimName: mail-storage
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: webmail
+  namespace: mailu-mailserver
+  labels:
+    app: mailu-roundcube
+    role: mail
+    tier: frontend
+spec:
+  selector:
+    app: mailu-roundcube
+    role: mail
+    tier: frontend
+  ports:
+  ports:
+  - name: http
+    port: 80
+    protocol: TCP
diff --git a/docs/kubernetes/nginx/default-http-backend.yaml b/docs/kubernetes/nginx/default-http-backend.yaml
new file mode 100644
index 00000000..097fe7c5
--- /dev/null
+++ b/docs/kubernetes/nginx/default-http-backend.yaml
@@ -0,0 +1,55 @@
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: default-http-backend
+  labels:
+    app: default-http-backend
+  namespace: kube-ingress
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: default-http-backend
+  template:
+    metadata:
+      labels:
+        app: default-http-backend
+    spec:
+      terminationGracePeriodSeconds: 60
+      containers:
+      - name: default-http-backend
+        # Any image is permissible as long as:
+        # 1. It serves a 404 page at /
+        # 2. It serves 200 on a /healthz endpoint
+        image: gcr.io/google_containers/defaultbackend:1.4
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 30
+          timeoutSeconds: 5
+        ports:
+        - containerPort: 8080
+        resources:
+          limits:
+            cpu: 10m
+            memory: 20Mi
+          requests:
+            cpu: 10m
+            memory: 20Mi
+---
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: default-http-backend
+  namespace: kube-ingress
+  labels:
+    app: default-http-backend
+spec:
+  ports:
+  - port: 80
+    targetPort: 8080
+  selector:
+    app: default-http-backend
\ No newline at end of file
diff --git a/docs/kubernetes/nginx/nginx-ingress.yaml b/docs/kubernetes/nginx/nginx-ingress.yaml
new file mode 100644
index 00000000..d8b71e21
--- /dev/null
+++ b/docs/kubernetes/nginx/nginx-ingress.yaml
@@ -0,0 +1,127 @@
+apiVersion: v1
+kind: Service
+metadata:
+  # keep it under 24 chars
+  name: ingress-lb
+  namespace: kube-ingress
+  labels:
+    k8s-app: ingress-lb
+    component: ingress-controller
+spec:
+  type: ClusterIP
+  selector:
+    k8s-app: ingress-lb
+    component: ingress-controller
+  ports:
+    - name: http
+      protocol: TCP
+      port: 80
+      targetPort: 80
+    - name: https
+      protocol: TCP
+      port: 443
+      targetPort: 443
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: udp-services
+  namespace: kube-ingress
+
+---
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: tcp-services
+  namespace: kube-ingress
+data:
+
+---
+apiVersion: v1
+data:
+  enable-vts-status: "true"
+kind: ConfigMap
+metadata:
+  name: nginx-ingress-lb-conf
+  namespace: kube-ingress
+---
+apiVersion: apps/v1beta2
+kind: DaemonSet
+metadata:
+  name: ingress-controller
+  namespace: kube-ingress
+  annotations:
+    prometheus.io/port: "10254"
+    prometheus.io/scrape: "true"
+  labels:
+    k8s-app: ingress-lb
+    component: ingress-controller
+    type: nginx
+spec:
+  updateStrategy:
+    rollingUpdate:
+      maxUnavailable: 1
+    type: RollingUpdate
+  selector:
+    matchLabels:
+      k8s-app: ingress-lb
+      component: ingress-controller
+      type: nginx
+  template:
+    metadata:
+      labels:
+        k8s-app: ingress-lb
+        component: ingress-controller
+        type: nginx
+    spec:
+      serviceAccount: kube-nginx-ingress
+      affinity:
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: node-role.kubernetes.io/master
+                operator: DoesNotExist
+      containers:
+        - name: nginx-ingress-lb
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.2
+          args:
+          - /nginx-ingress-controller
+          - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
+          - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
+          - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
+          - --annotations-prefix=ingress.kubernetes.io
+          - --enable-ssl-passthrough
+          # use downward API
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          ports:
+            - name: http
+              containerPort: 80
+            - name: https
+              containerPort: 443
+          readinessProbe:
+            httpGet:
+              path: /healthz
+              port: 10254
+              scheme: HTTP
+          livenessProbe:
+            initialDelaySeconds: 10
+            timeoutSeconds: 1
+            httpGet:
+              path: /healthz
+              port: 10254
+              scheme: HTTP
+      hostNetwork: true
+      nodeSelector:
+        node-role.kubernetes.io/node: ""
+      dnsPolicy: ClusterFirstWithHostNet
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 60
diff --git a/docs/kubernetes/nginx/rbac.yaml b/docs/kubernetes/nginx/rbac.yaml
new file mode 100644
index 00000000..d3c01384
--- /dev/null
+++ b/docs/kubernetes/nginx/rbac.yaml
@@ -0,0 +1,129 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: kube-ingress
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: kube-nginx-ingress
+  namespace: kube-ingress
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRole
+metadata:
+  name: kube-nginx-ingress
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - endpoints
+      - nodes
+      - pods
+      - secrets
+    verbs:
+      - list
+      - watch
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - nodes
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - services
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - "extensions"
+    resources:
+      - ingresses
+    verbs:
+      - get
+      - list
+      - watch
+  - apiGroups:
+      - ""
+    resources:
+        - events
+    verbs:
+        - create
+        - patch
+  - apiGroups:
+      - "extensions"
+    resources:
+      - ingresses/status
+    verbs:
+      - update
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: Role
+metadata:
+  name: kube-nginx-ingress
+  namespace: kube-ingress
+rules:
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+      - pods
+      - secrets
+      - namespaces
+    verbs:
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    resourceNames:
+      - "ingress-controller-leader-nginx"
+    verbs:
+      - get
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - create
+  - apiGroups:
+      - ""
+    resources:
+      - endpoints
+    verbs:
+      - get
+      - create
+      - update
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+  name: kube-nginx-ingress
+  namespace: kube-ingress
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: kube-nginx-ingress
+subjects:
+  - kind: ServiceAccount
+    name: kube-nginx-ingress
+    namespace: kube-ingress
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: kube-nginx-ingress
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: kube-nginx-ingress
+subjects:
+  - kind: ServiceAccount
+    name: kube-nginx-ingress
+    namespace: kube-ingress
\ No newline at end of file
diff --git a/services/rspamd/conf/worker-controller.inc b/services/rspamd/conf/worker-controller.inc
index 6a020672..d3ab55f4 100644
--- a/services/rspamd/conf/worker-controller.inc
+++ b/services/rspamd/conf/worker-controller.inc
@@ -1,3 +1,7 @@
 bind_socket = "*:11334";
+{% if RSPAMD_PASSWORD %}
+password = "{{ RSPAMD_PASSWORD }}";
+{% else %}
 password = "mailu";
+{% endif %}
 secure_ip = "{{ FRONT_ADDRESS }}";
diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile
index c779e71a..e8a1aeaf 100644
--- a/webmails/roundcube/Dockerfile
+++ b/webmails/roundcube/Dockerfile
@@ -4,10 +4,10 @@ RUN apt-get update && apt-get install -y \
       libfreetype6-dev \
       libjpeg62-turbo-dev \
       libmcrypt-dev \
-      libpng12-dev \
+      libpng-dev \
  && docker-php-ext-install pdo_mysql mcrypt zip
 
-ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.6/roundcubemail-1.3.6-complete.tar.gz
+ENV ROUNDCUBE_URL https://github.com/roundcube/roundcubemail/releases/download/1.3.7/roundcubemail-1.3.7-complete.tar.gz
 
 RUN echo date.timezone=UTC > /usr/local/etc/php/conf.d/timezone.ini
 
@@ -28,4 +28,4 @@ COPY config.inc.php /var/www/html/config/
 
 COPY start.sh /start.sh
 
-CMD ["/start.sh"]
+CMD ["/start.sh"]
\ No newline at end of file

From e67a0d464b16fb339710e61b90c91798db7e30d8 Mon Sep 17 00:00:00 2001
From: Hans Cornelis <hacornelis@gmail.com>
Date: Wed, 17 Oct 2018 07:44:21 +0200
Subject: [PATCH 19/53] Deleted old folder

---
 core/dovecot/Dockerfile_BACKUP_7007           |  19 +++
 core/dovecot/Dockerfile_BASE_7007             |  14 ++
 core/dovecot/Dockerfile_LOCAL_7007            |  14 ++
 core/dovecot/Dockerfile_REMOTE_7007           |  15 ++
 docs/kubernetes/1.6/README.md                 | 157 ------------------
 docs/kubernetes/1.6/mailu/admin.yaml          |  64 -------
 docs/kubernetes/1.6/mailu/configmap.yaml      | 153 -----------------
 docs/kubernetes/1.6/mailu/fetchmail.yaml      |  39 -----
 docs/kubernetes/1.6/mailu/front.yaml          | 129 --------------
 docs/kubernetes/1.6/mailu/imap.yaml           |  80 ---------
 docs/kubernetes/1.6/mailu/ingress-ssl.yaml    |  32 ----
 docs/kubernetes/1.6/mailu/pvc.yaml            |  27 ---
 docs/kubernetes/1.6/mailu/rbac.yaml           |   4 -
 docs/kubernetes/1.6/mailu/redis.yaml          |  56 -------
 docs/kubernetes/1.6/mailu/security.yaml       | 110 ------------
 docs/kubernetes/1.6/mailu/smtp.yaml           |  80 ---------
 docs/kubernetes/1.6/mailu/static-ips.yaml     |   0
 docs/kubernetes/1.6/mailu/webdav.yaml         |  63 -------
 docs/kubernetes/1.6/mailu/webmail.yaml        |  59 -------
 .../1.6/nginx/default-http-backend.yaml       |  55 ------
 docs/kubernetes/1.6/nginx/nginx-ingress.yaml  | 139 ----------------
 docs/kubernetes/1.6/nginx/rbac.yaml           | 129 --------------
 22 files changed, 62 insertions(+), 1376 deletions(-)
 create mode 100644 core/dovecot/Dockerfile_BACKUP_7007
 create mode 100644 core/dovecot/Dockerfile_BASE_7007
 create mode 100644 core/dovecot/Dockerfile_LOCAL_7007
 create mode 100644 core/dovecot/Dockerfile_REMOTE_7007
 delete mode 100644 docs/kubernetes/1.6/README.md
 delete mode 100644 docs/kubernetes/1.6/mailu/admin.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/configmap.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/fetchmail.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/front.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/imap.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/ingress-ssl.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/pvc.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/rbac.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/redis.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/security.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/smtp.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/static-ips.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/webdav.yaml
 delete mode 100644 docs/kubernetes/1.6/mailu/webmail.yaml
 delete mode 100644 docs/kubernetes/1.6/nginx/default-http-backend.yaml
 delete mode 100644 docs/kubernetes/1.6/nginx/nginx-ingress.yaml
 delete mode 100644 docs/kubernetes/1.6/nginx/rbac.yaml

diff --git a/core/dovecot/Dockerfile_BACKUP_7007 b/core/dovecot/Dockerfile_BACKUP_7007
new file mode 100644
index 00000000..b5590a73
--- /dev/null
+++ b/core/dovecot/Dockerfile_BACKUP_7007
@@ -0,0 +1,19 @@
+<<<<<<< HEAD
+FROM alpine:3.7
+=======
+FROM alpine:3.8
+>>>>>>> upstream/master
+
+RUN apk add --no-cache \
+     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
+     python3 py3-pip \
+ && pip3 install --upgrade pip \
+ && pip3 install jinja2 podop tenacity
+
+COPY conf /conf
+COPY start.py /start.py
+
+EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
+VOLUME ["/data", "/mail"]
+
+CMD /start.py
\ No newline at end of file
diff --git a/core/dovecot/Dockerfile_BASE_7007 b/core/dovecot/Dockerfile_BASE_7007
new file mode 100644
index 00000000..cacfe354
--- /dev/null
+++ b/core/dovecot/Dockerfile_BASE_7007
@@ -0,0 +1,14 @@
+FROM alpine:edge
+
+RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
+ && apk add --no-cache \
+     dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
+     rspamd-client@testing python py-jinja2
+
+COPY conf /conf
+COPY sieve /var/lib/dovecot
+COPY start.py /start.py
+
+EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
+
+CMD /start.py
diff --git a/core/dovecot/Dockerfile_LOCAL_7007 b/core/dovecot/Dockerfile_LOCAL_7007
new file mode 100644
index 00000000..29957921
--- /dev/null
+++ b/core/dovecot/Dockerfile_LOCAL_7007
@@ -0,0 +1,14 @@
+FROM alpine:3.7
+
+RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
+ && apk add --no-cache \
+     dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
+     rspamd-client@testing python py-jinja2
+
+COPY conf /conf
+COPY sieve /var/lib/dovecot
+COPY start.py /start.py
+
+EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
+
+CMD /start.py
\ No newline at end of file
diff --git a/core/dovecot/Dockerfile_REMOTE_7007 b/core/dovecot/Dockerfile_REMOTE_7007
new file mode 100644
index 00000000..d8d4c55b
--- /dev/null
+++ b/core/dovecot/Dockerfile_REMOTE_7007
@@ -0,0 +1,15 @@
+FROM alpine:3.8
+
+RUN apk add --no-cache \
+     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
+     python3 py3-pip \
+ && pip3 install --upgrade pip \
+ && pip3 install jinja2 podop tenacity
+
+COPY conf /conf
+COPY start.py /start.py
+
+EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
+VOLUME ["/data", "/mail"]
+
+CMD /start.py
diff --git a/docs/kubernetes/1.6/README.md b/docs/kubernetes/1.6/README.md
deleted file mode 100644
index c0dd935b..00000000
--- a/docs/kubernetes/1.6/README.md
+++ /dev/null
@@ -1,157 +0,0 @@
-# Install Mailu master on kubernetes
-
-## Prequisites
-
-### Structure
-
-There's chosen to have a double NGINX stack for Mailu, this way the main ingress can still be used to access other websites/domains on your cluster. This is the current structure:
-
-- `NGINX Ingress controller`: Listens to the nodes ports 80 & 443 and directly forwards all TCP traffic on the E-amail ports (993,143,25,587,...). This is because this `DaemonSet` already consumes ports 80 & 443 and uses `hostNetwork: true`
-- `Cert manager`: Creates automatic Lets Encrypt certificates based on an `Ingress`-objects domain name.
-- `Mailu NGINX Front container`: This container receives all the mail traffic forwarded from the ingress controller. The web traffic is also forwarded based on an ingress
-- `Mailu components`: All Mailu components are split into separate files to make them more 
-
-### What you need
-- A working Kubernetes cluster (tested with 1.10.5)
-- A working [cert-manager](https://github.com/jetstack/cert-manager) installation
-- A working nginx-ingress controller needed for the lets-encrypt certificates. You can find those files in the `nginx` subfolder
-
-#### Cert manager
-
-The `Cert-manager` is quite easy to deploy using Helm when reading the [docs](https://cert-manager.readthedocs.io/en/latest/getting-started/2-installing.html). 
-After booting the `Cert-manager` you'll need a `ClusterIssuer` which takes care of all required certificates through `Ingress` items. An example:
-
-```yaml
-apiVersion: certmanager.k8s.io/v1alpha1
-kind: ClusterIssuer
-metadata:
-  name: letsencrypt-prod
-spec:
-  acme:
-    email: something@example.com
-    http01: {}
-    privateKeySecretRef:
-      key: ""
-      name: letsencrypt-stage
-    server: https://acme-v02.api.letsencrypt.org/directory
-```
-
-## Deploying Mailu
-
-All manifests can be found in the `mailu` subdirectory. All commands below need to be run from this subdirectory
-
-### Personalization
-- All services run in the same namespace, currently `mailu-mailserver`. So if you want to use a different one, change the `namespace` value in **every** file
-- Check the `storage-class` field in the `pvc.yaml` file, you can also change the sizes to your liking. Note that you need `RWX` (read-write-many) and `RWO` (read-write-once) storageclasses.
-- Check the `configmap.yaml` and adapt it to your needs. Be sure to check the kubernetes DNS values at the end (if you use a different namespace)
-- Check the `ingress-ssl.yaml` and change it to the domain you want (this is for the kubernetes ingress controller, it will forward to `mailu/nginx` a.k.a. the `front` pod)
-
-## Installation
-First run the command to start Mailu:
-
-```bash
-kubectl create -f rbac.yaml
-kubectl create -f configmap.yaml
-kubectl create -f pvc.yaml
-kubectl create -f ingress-ssl.yaml
-kubectl create -f redis.yaml
-kubectl create -f front.yaml
-kubectl create -f webmail.yaml
-kubectl create -f imap.yaml
-kubectl create -f security.yaml
-kubectl create -f smtp.yaml
-kubectl create -f fetchmail.yaml
-kubectl create -f admin.yaml
-kubectl create -f webdav.yaml
-```
-
-## Create the first admin account
-
-When the cluster is online you need to create you master user to access `https://mail.example.com/admin`.
-Enter the main `admin` pod to create the root account:
-
-```bash
-kubectl -n mailu-mailserver get po
-kubectl -n mailu-mailserver exec -it mailu-admin-.... /bin/sh
-```
-
-And in the pod run the following command. The command uses following entries:
-- `admin` Make it an admin user
-- `root` The first part of the e-mail adres (ROOT@example.com)
-- `example.com` the domain appendix
-- `password` the chosen password for the user
-
-```bash
-python manage.py admin root example.com password
-```
-
-Now you should be able to login on the mail account: `https://mail.example.com/admin`
-
-## Adaptations
-
-### Postfix
-I noticed you need an override for the `postfix` server in order to be able to send mail. I noticed Google wasn't able to deliver mail to my account and it had to do with the `smtpd_authorized_xclient_hosts` value in the config file. The config can be read [here](https://github.com/hacor/Mailu/blob/master/core/postfix/conf/main.cf#L35) and is pointing to a single IP of the service. But the requests come from the host IPs (the NGINX Ingress proxy) and they don't use the service specific IP.
-
-Enter the `postfix` pod:
-
-```bash
-kubectl -n mailu-mailserver get po
-kubectl -n mailu-mailserver exec -it mailu-smtp-.... /bin/sh
-```
-
-Now you're in the pod, create an override file like so:
-
-```bash
-vi /overrides/postfix.cf
-```
-
-And give it the following contents, off course replacing `10.2.0.0/16` with the CIDR of your pod range. This way the NGINX pods can also restart and your mail server will still operate
-
-```bash
-not_needed = true
-smtpd_authorized_xclient_hosts = 10.2.0.0/16
-```
-
-The first line seems stupid, but is needed because its pasted after a #, so from the second line we're really in action.
-Save and close the file and exit. Now you need to delete the pod in order to recreate the config file.
-
-```bash
-kubectl -n mailu-mailserver delete po/mailu-smtp-....
-```
-
-### Dovecot
-- If you are using Dovecot on a shared file system (Glusterfs, NFS,...), you need to create a special override otherwise a lot of indexing errors will occur on your Dovecot pod.
-- I also higher the number of max connections per IP. Now it's limited to 10.
-Enter the dovecot pod:
-
-```bash
-kubectl -n mailu-mailserver get po
-kubectl -n mailu-mailserver exec -it mailu-imap-.... /bin/sh
-```
-
-Create the file `/overrides/dovecot.conf`
-
-```bash
-vi /overrides/dovecot.conf
-```
-
-And enter following contents:
-```bash
-mail_nfs_index = yes
-mail_nfs_storage = yes
-mail_fsync = always
-mmap_disable = yes
-mail_max_userip_connections=100
-```
-
-Save and close the file and delete the imap pod to get it recreated.
-
-```bash
-kubectl -n mailu-mailserver delete po/mailu-imap-....
-```
-
-Wait for the pod to recreate and you're online!
-Happy mailing!
-
-Wait for the pod to recreate and you're online!
-Happy mailing!
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/admin.yaml b/docs/kubernetes/1.6/mailu/admin.yaml
deleted file mode 100644
index b36760a2..00000000
--- a/docs/kubernetes/1.6/mailu/admin.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-admin
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-admin
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: admin
-        image: mailu/admin:master
-        imagePullPolicy: Always
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        volumeMounts:
-          - name: maildata
-            mountPath: /data
-            subPath: maildata
-          - name: maildata
-            mountPath: /dkim
-            subPath: dkim
-        ports:
-          - name: http
-            containerPort: 80
-            protocol: TCP
-        resources:
-          requests:
-            memory: 500Mi
-            cpu: 500m
-          limits:
-            memory: 500Mi
-            cpu: 500m
-      volumes:
-        - name: maildata
-          persistentVolumeClaim:
-            claimName: mail-storage
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: admin
-  namespace: mailu-mailserver
-  labels:
-    app: mailu-admin
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-admin
-    role: mail
-    tier: backend
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/configmap.yaml b/docs/kubernetes/1.6/mailu/configmap.yaml
deleted file mode 100644
index 9ebce8b1..00000000
--- a/docs/kubernetes/1.6/mailu/configmap.yaml
+++ /dev/null
@@ -1,153 +0,0 @@
-   apiVersion: v1
-   kind: ConfigMap
-   metadata:
-     name: mailu-config
-     namespace: mailu-mailserver
-   data:
-    # Mailu main configuration file
-    #
-    # Most configuration variables can be modified through the Web interface,
-    # these few settings must however be configured before starting the mail
-    # server and require a restart upon change.
-
-    ###################################
-    # Common configuration variables
-    ###################################
-
-    # Set this to the path where Mailu data and configuration is stored
-    ROOT: "/mailu"
-
-    # Mailu version to run (1.0, 1.1, etc. or master)
-    VERSION: "master"
-
-    # Set to a randomly generated 16 bytes string
-    SECRET_KEY: "YourKeyHere"
-
-    # Address where listening ports should bind
-    BIND_ADDRESS4: "127.0.0.1"
-    #BIND_ADDRESS6: "::1"
-
-    # Main mail domain
-    DOMAIN: "example.com"
-
-    # Hostnames for this server, separated with comas
-    HOSTNAMES: "mail.example.com"
-
-    # Postmaster local part (will append the main mail domain)
-    POSTMASTER: "admin"
-
-    # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
-    TLS_FLAVOR: "cert"
-
-    # Authentication rate limit (per source IP address)
-    AUTH_RATELIMIT: "10/minute;1000/hour"
-
-    # Opt-out of statistics, replace with "True" to opt out
-    DISABLE_STATISTICS: "False"
-
-    ###################################
-    # Optional features
-    ###################################
-
-    # Expose the admin interface (value: true, false)
-    ADMIN: "true"
-    # Run the admin interface in debug mode
-    #DEBUG: "True"
-
-    # Choose which webmail to run if any (values: roundcube, rainloop, none)
-    WEBMAIL: "roundcube"
-
-    # Dav server implementation (value: radicale, none)
-    WEBDAV: "radicale"
-
-    # Antivirus solution (value: clamav, none)
-    ANTIVIRUS: "clamav"
-
-    ###################################
-    # Mail settings
-    ###################################
-
-    # Message size limit in bytes
-    # Default: accept messages up to 50MB
-    MESSAGE_SIZE_LIMIT: "50000000"
-
-    # Networks granted relay permissions, make sure that you include your Docker
-    # internal network (default to 172.17.0.0/16)
-    # For kubernetes this is the CIDR of the pod network
-    RELAYNETS: "10.2.0.0/16"
-    POD_ADDRESS_RANGE: "10.2.0.0/16"
-
-
-    # Will relay all outgoing mails if configured
-    #RELAYHOST=
-
-    # This part is needed for the XCLIENT login for postfix. This should be the POD ADDRESS range
-    FRONT_ADDRESS: "front.mailu-mailserver.svc.cluster.local"
-
-    # Fetchmail delay
-    FETCHMAIL_DELAY: "600"
-
-    # Recipient delimiter, character used to delimiter localpart from custom address part
-    # e.g. localpart+custom@domain;tld
-    RECIPIENT_DELIMITER: "+"
-
-    # DMARC rua and ruf email
-    DMARC_RUA: "root"
-    DMARC_RUF: "root"
-
-    # Welcome email, enable and set a topic and body if you wish to send welcome
-    # emails to all users.
-    WELCOME: "false"
-    WELCOME_SUBJECT: "Welcome to your new email account"
-    WELCOME_BODY: "Welcome to your new email account, if you can read this, then it is configured properly!"
-
-    ###################################
-    # Web settings
-    ###################################
-
-    # Path to the admin interface if enabled
-    WEB_ADMIN: "/admin"
-
-    # Path to the webmail if enabled
-    WEB_WEBMAIL: "/webmail"
-
-    # Website name
-    SITENAME: "AppSynth"
-
-    # Linked Website URL
-    WEBSITE: "https://example.com"
-
-    # Registration reCaptcha settings (warning, this has some privacy impact)
-    # RECAPTCHA_PUBLIC_KEY=
-    # RECAPTCHA_PRIVATE_KEY=
-
-    # Domain registration, uncomment to enable
-    # DOMAIN_REGISTRATION=true
-
-    ###################################
-    # Advanced settings
-    ###################################
-
-    # Docker-compose project name, this will prepended to containers names.
-    COMPOSE_PROJECT_NAME: "mailu"
-
-    # Default password scheme used for newly created accounts and changed passwords
-    # (value: SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
-    PASSWORD_SCHEME: "SHA512-CRYPT"
-
-    # Header to take the real ip from
-    #REAL_IP_HEADER:
-
-    # IPs for nginx set_real_ip_from (CIDR list separated by commas)
-    #REAL_IP_FROM:
-
-    # Host settings
-    HOST_IMAP: "imap.mailu-mailserver.svc.cluster.local"
-    HOST_POP3: "imap.mailu-mailserver.svc.cluster.local"
-    HOST_SMTP: "smtp.mailu-mailserver.svc.cluster.local"
-    HOST_AUTHSMTP: "smtp.mailu-mailserver.svc.cluster.local"
-    HOST_WEBMAIL: "webmail.mailu-mailserver.svc.cluster.local"
-    HOST_ADMIN: "admin.mailu-mailserver.svc.cluster.local"
-    HOST_WEBDAV: "webdav.mailu-mailserver.svc.cluster.local:5232"
-    HOST_ANTISPAM: "antispam.mailu-mailserver.svc.cluster.local:11332"
-    HOST_REDIS: "redis.mailu-mailserver.svc.cluster.local"
diff --git a/docs/kubernetes/1.6/mailu/fetchmail.yaml b/docs/kubernetes/1.6/mailu/fetchmail.yaml
deleted file mode 100644
index cf3271e7..00000000
--- a/docs/kubernetes/1.6/mailu/fetchmail.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-fetchmail
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-fetchmail
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: fetchmail
-        image: mailu/fetchmail:master
-        imagePullPolicy: Always
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        volumeMounts:
-          - name: maildata
-            mountPath: /data
-            subPath: maildata
-        ports:
-          - containerPort: 5232
-          - containerPort: 80
-        resources:
-          requests:
-            memory: 100Mi
-            cpu: 100m
-          limits:
-            memory: 100Mi
-            cpu: 100m
-      volumes:
-        - name: maildata
-          persistentVolumeClaim:
-            claimName: mail-storage
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/front.yaml b/docs/kubernetes/1.6/mailu/front.yaml
deleted file mode 100644
index e25ac828..00000000
--- a/docs/kubernetes/1.6/mailu/front.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-front
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-front
-        role: mail
-        tier: backend
-    spec:
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 60
-      containers:
-      - name: front
-        image: mailu/nginx:latest
-        imagePullPolicy: Always
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        volumeMounts:
-          - name: certs
-            mountPath: /certs
-        ports:
-          - name: http
-            containerPort: 80
-            protocol: TCP
-          - name: https
-            containerPort: 443
-            protocol: TCP
-          - name: pop3
-            containerPort: 110
-            protocol: TCP
-          - name: pop3s
-            containerPort: 995
-            protocol: TCP
-          - name: imap
-            containerPort: 143
-            protocol: TCP
-          - name: imaps
-            containerPort: 993
-            protocol: TCP
-          - name: smtp
-            containerPort: 25
-            protocol: TCP
-          - name: smtp-auth
-            containerPort: 10025
-            protocol: TCP
-          - name: imap-auth
-            containerPort: 10143
-            protocol: TCP
-          - name: smtps
-            containerPort: 465
-            protocol: TCP
-          - name: smtpd
-            containerPort: 587
-            protocol: TCP
-          - name: auth
-            containerPort: 8000
-            protocol: TCP
-        resources:
-          requests:
-            memory: 100Mi
-            cpu: 100m
-          limits:
-            memory: 200Mi
-            cpu: 200m
-      volumes:
-        - name: certs
-          secret:
-            items:
-              - key: tls.crt
-                path: cert.pem
-              - key: tls.key
-                path: key.pem
-            secretName: letsencrypt-certs-all
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: front
-  namespace: mailu-mailserver
-  labels:
-    app: mailu-admin
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-front
-    role: mail
-    tier: backend
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-  - name: https
-    port: 443
-    protocol: TCP
-  - name: pop3
-    port: 110
-    protocol: TCP
-  - name: pop3s
-    port: 995
-    protocol: TCP
-  - name: imap
-    port: 143
-    protocol: TCP
-  - name: imaps
-    port: 993
-    protocol: TCP
-  - name: smtp
-    port: 25
-    protocol: TCP
-  - name: smtps
-    port: 465
-    protocol: TCP
-  - name: smtpd
-    port: 587
-    protocol: TCP
-  - name: smtp-auth
-    port: 10025
-    protocol: TCP
-  - name: imap-auth
-    port: 10143
-    protocol: TCP
diff --git a/docs/kubernetes/1.6/mailu/imap.yaml b/docs/kubernetes/1.6/mailu/imap.yaml
deleted file mode 100644
index 069b7730..00000000
--- a/docs/kubernetes/1.6/mailu/imap.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-imap
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-imap
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: imap
-        image: mailu/dovecot:master
-        imagePullPolicy: Always
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        volumeMounts:
-          - mountPath: /data
-            name: maildata
-            subPath: maildata
-          - mountPath: /mail
-            name: maildata
-            subPath: mailstate
-          - mountPath: /overrides
-            name: maildata
-            subPath: overrides
-        ports:
-          - containerPort: 2102
-          - containerPort: 2525
-          - containerPort: 143
-          - containerPort: 993
-          - containerPort: 4190
-        resources:
-          requests:
-            memory: 500Mi
-            cpu: 500m
-          limits:
-            memory: 1Gi
-            cpu: 1000m
-      volumes:
-        - name: maildata
-          persistentVolumeClaim:
-            claimName: mail-storage
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: imap
-  namespace: mailu-mailserver
-  labels:
-    app: mailu
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-imap
-    role: mail
-    tier: backend
-  ports:
-  ports:
-  - name: imap-auth
-    port: 2102
-    protocol: TCP
-  - name: imap-transport
-    port: 2525
-    protocol: TCP
-  - name: imap-default
-    port: 143
-    protocol: TCP
-  - name: imap-ssl
-    port: 993
-    protocol: TCP
-  - name: sieve
-    port: 4190
-    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/ingress-ssl.yaml b/docs/kubernetes/1.6/mailu/ingress-ssl.yaml
deleted file mode 100644
index 61ae3cf7..00000000
--- a/docs/kubernetes/1.6/mailu/ingress-ssl.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: mailu-ssl-ingress
-  namespace: mailu-mailserver
-  annotations:
-    kubernetes.io/ingress.class: tectonic
-    kubernetes.io/tls-acme: "true"
-    nginx.ingress.kubernetes.io/proxy-body-size: "0"
-    ingress.kubernetes.io/ssl-redirect: "true"
-    # Replace letsencrypt-prod with the name of the certificate issuer
-    certmanager.k8s.io/cluster-issuer: letsencrypt-prod
-    #ingress.kubernetes.io/rewrite-target: "/"
-    #ingress.kubernetes.io/app-root: "/ui"
-    #ingress.kubernetes.io/follow-redirects: "true"
-  labels:
-    app: mailu
-    role: mail
-    tier: backend
-spec:
-  tls:
-  - hosts:
-    - "mail.example.com"
-    secretName: letsencrypt-certs-all # If unsure how to generate these, check out https://github.com/ployst/docker-letsencrypt
-  rules:
-  - host: "mail.example.com"
-    http:
-      paths:
-      - path: "/"
-        backend:
-          serviceName: front
-          servicePort: 80
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/pvc.yaml b/docs/kubernetes/1.6/mailu/pvc.yaml
deleted file mode 100644
index 0ec2852f..00000000
--- a/docs/kubernetes/1.6/mailu/pvc.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: redis-hdd
-  namespace: mailu-mailserver
-  annotations:
-    volume.beta.kubernetes.io/storage-class: "glusterblock-hdd"
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: mail-storage
-  namespace: mailu-mailserver
-  annotations:
-    volume.beta.kubernetes.io/storage-class: "gluster-heketi-hdd"
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 100Gi
diff --git a/docs/kubernetes/1.6/mailu/rbac.yaml b/docs/kubernetes/1.6/mailu/rbac.yaml
deleted file mode 100644
index 33255130..00000000
--- a/docs/kubernetes/1.6/mailu/rbac.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mailu-mailserver
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/redis.yaml b/docs/kubernetes/1.6/mailu/redis.yaml
deleted file mode 100644
index d6bb1eb8..00000000
--- a/docs/kubernetes/1.6/mailu/redis.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-redis
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-redis
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: redis
-        image: redis:4.0-alpine
-        imagePullPolicy: Always
-        volumeMounts:
-          - mountPath: /data
-            name: redisdata
-        ports:
-          - containerPort: 6379
-            name: redis
-            protocol: TCP
-        resources:
-          requests:
-            memory: 200Mi
-            cpu: 100m
-          limits:
-            memory: 300Mi
-            cpu: 200m
-      volumes:
-        - name: redisdata
-          persistentVolumeClaim:
-            claimName: redis-hdd
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-  namespace: mailu-mailserver
-  labels:
-    app: mailu-redis
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-redis
-    role: mail
-    tier: backend
-  ports:
-  - name: redis
-    port: 6379
-    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/security.yaml b/docs/kubernetes/1.6/mailu/security.yaml
deleted file mode 100644
index c1c1ac0b..00000000
--- a/docs/kubernetes/1.6/mailu/security.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-security
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-security
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: antispam
-        image: mailu/rspamd:master
-        imagePullPolicy: Always
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        resources:
-          requests:
-            memory: 100Mi
-            cpu: 100m
-          limits:
-            memory: 200Mi
-            cpu: 200m
-        ports:
-          - name: antispam
-            containerPort: 11332
-            protocol: TCP
-        volumeMounts:
-          - name: filter
-            subPath: filter
-            mountPath: /var/lib/rspamd
-          - name: filter
-            mountPath: /dkim
-            subPath: dkim
-          - name: filter
-            mountPath: /etc/rspamd/override.d
-            subPath: rspamd-overrides
-      - name: antivirus
-        image: mailu/clamav:master
-        imagePullPolicy: Always
-        resources:
-          requests:
-            memory: 1Gi
-            cpu: 1000m
-          limits:
-            memory: 2Gi
-            cpu: 1000m
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        ports:
-          - name: antivirus
-            containerPort: 3310
-            protocol: TCP
-        volumeMounts:
-          - name: filter
-            subPath: filter
-            mountPath: /data
-      volumes:
-        - name: filter
-          persistentVolumeClaim:
-            claimName: mail-storage
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: antispam
-  namespace: mailu-mailserver
-  labels:
-    app: mailu-antispam
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-security
-    role: mail
-    tier: backend
-  ports:
-  - name: antispam
-    port: 11332
-    protocol: TCP
-
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: antivirus
-  namespace: mailu-mailserver
-  labels:
-    app: mailu-antivirus
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-security
-    role: mail
-    tier: backend
-  ports:
-  - name: antivirus
-    port: 3310
-    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/smtp.yaml b/docs/kubernetes/1.6/mailu/smtp.yaml
deleted file mode 100644
index 454b8ed7..00000000
--- a/docs/kubernetes/1.6/mailu/smtp.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-smtp
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-smtp
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: smtp
-        image: mailu/postfix:master
-        imagePullPolicy: Always
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        resources:
-          requests:
-            memory: 500Mi
-            cpu: 200m
-          limits:
-            memory: 1Gi
-            cpu: 500m
-        volumeMounts:
-          - mountPath: /data
-            name: maildata
-            subPath: maildata
-          - mountPath: /overrides
-            name: maildata
-            subPath: overrides
-        ports:
-          - name: smtp
-            containerPort: 25
-            protocol: TCP
-          - name: smtp-ssl
-            containerPort: 465
-            protocol: TCP
-          - name: smtp-starttls
-            containerPort: 587
-            protocol: TCP
-          - name: smtp-auth
-            containerPort: 10025
-            protocol: TCP
-      volumes:
-        - name: maildata
-          persistentVolumeClaim:
-            claimName: mail-storage
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: smtp
-  namespace: mailu-mailserver
-  labels:
-    app: mailu
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-smtp
-    role: mail
-    tier: backend
-  ports:
-  - name: smtp
-    port: 25
-    protocol: TCP
-  - name: smtp-ssl
-    port: 465
-    protocol: TCP
-  - name: smtp-starttls
-    port: 587
-    protocol: TCP
-  - name: smtp-auth
-    port: 10025
-    protocol: TCP
diff --git a/docs/kubernetes/1.6/mailu/static-ips.yaml b/docs/kubernetes/1.6/mailu/static-ips.yaml
deleted file mode 100644
index e69de29b..00000000
diff --git a/docs/kubernetes/1.6/mailu/webdav.yaml b/docs/kubernetes/1.6/mailu/webdav.yaml
deleted file mode 100644
index 07b7733c..00000000
--- a/docs/kubernetes/1.6/mailu/webdav.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-webdav
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-webdav
-        role: mail
-        tier: backend
-    spec:
-      containers:
-      - name: radicale
-        image: mailu/radicale:master
-        imagePullPolicy: Always
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        volumeMounts:
-          - mountPath: /data
-            name: maildata
-            subPath: dav
-        ports:
-          - containerPort: 5232
-          - containerPort: 80
-        resources:
-          requests:
-            memory: 100Mi
-            cpu: 100m
-          limits:
-            memory: 100Mi
-            cpu: 100m
-      volumes:
-        - name: maildata
-          persistentVolumeClaim:
-            claimName: mail-storage
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: webdav
-  namespace: mailu-mailserver
-  labels:
-    app: mailu-webdav
-    role: mail
-    tier: backend
-spec:
-  selector:
-    app: mailu-webdav
-    role: mail
-    tier: backend
-  ports:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-  - name: http-ui
-    port: 5232
-    protocol: TCP
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/mailu/webmail.yaml b/docs/kubernetes/1.6/mailu/webmail.yaml
deleted file mode 100644
index 81798782..00000000
--- a/docs/kubernetes/1.6/mailu/webmail.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: mailu-roundcube
-  namespace: mailu-mailserver
-spec:
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        app: mailu-roundcube
-        role: mail
-        tier: frontend
-    spec:
-      containers:
-      - name: roundcube
-        image: mailu/roundcube:1.5
-        imagePullPolicy: Always
-        envFrom:
-          - configMapRef:
-              name: mailu-config
-        resources:
-          requests:
-            memory: 100Mi
-            cpu: 100m
-          limits:
-            memory: 200Mi
-            cpu: 200m
-        volumeMounts:
-          - mountPath: /data
-            name: maildata
-            subPath: webmail
-        ports:
-          - containerPort: 80
-      volumes:
-        - name: maildata
-          persistentVolumeClaim:
-            claimName: mail-storage
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: webmail
-  namespace: mailu-mailserver
-  labels:
-    app: mailu-roundcube
-    role: mail
-    tier: frontend
-spec:
-  selector:
-    app: mailu-roundcube
-    role: mail
-    tier: frontend
-  ports:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
diff --git a/docs/kubernetes/1.6/nginx/default-http-backend.yaml b/docs/kubernetes/1.6/nginx/default-http-backend.yaml
deleted file mode 100644
index 097fe7c5..00000000
--- a/docs/kubernetes/1.6/nginx/default-http-backend.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: default-http-backend
-  labels:
-    app: default-http-backend
-  namespace: kube-ingress
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: default-http-backend
-  template:
-    metadata:
-      labels:
-        app: default-http-backend
-    spec:
-      terminationGracePeriodSeconds: 60
-      containers:
-      - name: default-http-backend
-        # Any image is permissible as long as:
-        # 1. It serves a 404 page at /
-        # 2. It serves 200 on a /healthz endpoint
-        image: gcr.io/google_containers/defaultbackend:1.4
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8080
-            scheme: HTTP
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-        ports:
-        - containerPort: 8080
-        resources:
-          limits:
-            cpu: 10m
-            memory: 20Mi
-          requests:
-            cpu: 10m
-            memory: 20Mi
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: default-http-backend
-  namespace: kube-ingress
-  labels:
-    app: default-http-backend
-spec:
-  ports:
-  - port: 80
-    targetPort: 8080
-  selector:
-    app: default-http-backend
\ No newline at end of file
diff --git a/docs/kubernetes/1.6/nginx/nginx-ingress.yaml b/docs/kubernetes/1.6/nginx/nginx-ingress.yaml
deleted file mode 100644
index 90b24f24..00000000
--- a/docs/kubernetes/1.6/nginx/nginx-ingress.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  # keep it under 24 chars
-  name: appsynth-lb
-  namespace: kube-ingress
-  labels:
-    k8s-app: appsynth-lb
-    component: ingress-controller
-spec:
-  type: ClusterIP
-  selector:
-    k8s-app: appsynth-lb
-    component: ingress-controller
-  ports:
-    - name: http
-      protocol: TCP
-      port: 80
-      targetPort: 80
-    - name: https
-      protocol: TCP
-      port: 443
-      targetPort: 443
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: udp-services
-  namespace: kube-ingress
-
----
-kind: ConfigMap
-apiVersion: v1
-metadata:
-  name: tcp-services
-  namespace: kube-ingress
-data:
-  25: "mailu-mailserver/front:25"
-  110: "mailu-mailserver/front:110"
-  465: "mailu-mailserver/front:465"
-  587: "mailu-mailserver/front:587"
-  143: "mailu-mailserver/front:143"
-  993: "mailu-mailserver/front:993"
-  995: "mailu-mailserver/front:995"
-
----
-apiVersion: v1
-data:
-  enable-vts-status: "true"
-kind: ConfigMap
-metadata:
-  name: nginx-ingress-lb-conf
-  namespace: kube-ingress
----
-apiVersion: apps/v1beta2
-kind: DaemonSet
-metadata:
-  name: ingress-controller
-  namespace: kube-ingress
-  annotations:
-    prometheus.io/port: "10254"
-    prometheus.io/scrape: "true"
-  labels:
-    k8s-app: appsynth-lb
-    component: ingress-controller
-    type: nginx
-spec:
-  updateStrategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
-  selector:
-    matchLabels:
-      k8s-app: appsynth-lb
-      component: ingress-controller
-      type: nginx
-  template:
-    metadata:
-      labels:
-        k8s-app: appsynth-lb
-        component: ingress-controller
-        type: nginx
-    spec:
-      serviceAccount: kube-nginx-ingress
-      affinity:
-        nodeAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-            nodeSelectorTerms:
-            - matchExpressions:
-              - key: node-role.kubernetes.io/master
-                operator: DoesNotExist
-      containers:
-        - name: nginx-ingress-lb
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.16.2
-          args:
-          - /nginx-ingress-controller
-          - --configmap=$(POD_NAMESPACE)/tectonic-custom-error
-          - --default-backend-service=$(POD_NAMESPACE)/default-http-backend
-          #- --default-ssl-certificate=tectonic-system/tectonic-ingress-tls-secret
-          - --tcp-services-configmap=$(POD_NAMESPACE)/tcp-services
-          - --udp-services-configmap=$(POD_NAMESPACE)/udp-services
-          - --annotations-prefix=ingress.kubernetes.io
-          - --enable-ssl-passthrough
-          - --ingress-class=tectonic
-          # use downward API
-          env:
-            - name: POD_NAME
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.name
-            - name: POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-          ports:
-            - name: http
-              containerPort: 80
-              hostPort: 80
-            - name: https
-              containerPort: 443
-              hostPort: 443
-          readinessProbe:
-            httpGet:
-              path: /healthz
-              port: 10254
-              scheme: HTTP
-          livenessProbe:
-            initialDelaySeconds: 10
-            timeoutSeconds: 1
-            httpGet:
-              path: /healthz
-              port: 10254
-              scheme: HTTP
-      hostNetwork: true
-      nodeSelector:
-        node-role.kubernetes.io/node: ""
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 60
diff --git a/docs/kubernetes/1.6/nginx/rbac.yaml b/docs/kubernetes/1.6/nginx/rbac.yaml
deleted file mode 100644
index d3c01384..00000000
--- a/docs/kubernetes/1.6/nginx/rbac.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: kube-ingress
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: kube-nginx-ingress
-  namespace: kube-ingress
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRole
-metadata:
-  name: kube-nginx-ingress
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-      - endpoints
-      - nodes
-      - pods
-      - secrets
-    verbs:
-      - list
-      - watch
-      - update
-  - apiGroups:
-      - ""
-    resources:
-      - nodes
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - services
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - "extensions"
-    resources:
-      - ingresses
-    verbs:
-      - get
-      - list
-      - watch
-  - apiGroups:
-      - ""
-    resources:
-        - events
-    verbs:
-        - create
-        - patch
-  - apiGroups:
-      - "extensions"
-    resources:
-      - ingresses/status
-    verbs:
-      - update
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: Role
-metadata:
-  name: kube-nginx-ingress
-  namespace: kube-ingress
-rules:
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-      - pods
-      - secrets
-      - namespaces
-    verbs:
-      - get
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    resourceNames:
-      - "ingress-controller-leader-nginx"
-    verbs:
-      - get
-      - update
-  - apiGroups:
-      - ""
-    resources:
-      - configmaps
-    verbs:
-      - create
-  - apiGroups:
-      - ""
-    resources:
-      - endpoints
-    verbs:
-      - get
-      - create
-      - update
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: RoleBinding
-metadata:
-  name: kube-nginx-ingress
-  namespace: kube-ingress
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: Role
-  name: kube-nginx-ingress
-subjects:
-  - kind: ServiceAccount
-    name: kube-nginx-ingress
-    namespace: kube-ingress
----
-apiVersion: rbac.authorization.k8s.io/v1beta1
-kind: ClusterRoleBinding
-metadata:
-  name: kube-nginx-ingress
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: kube-nginx-ingress
-subjects:
-  - kind: ServiceAccount
-    name: kube-nginx-ingress
-    namespace: kube-ingress
\ No newline at end of file

From ef55ca525c1286006c5090f4c653d133557851bb Mon Sep 17 00:00:00 2001
From: Hans Cornelis <hacornelis@gmail.com>
Date: Wed, 17 Oct 2018 07:48:52 +0200
Subject: [PATCH 20/53] Deleted conflicting merge files

Signed-off-by: Hans Cornelis <hacornelis@gmail.com>
---
 core/dovecot/Dockerfile_BACKUP_7007 | 19 -------------------
 core/dovecot/Dockerfile_BASE_7007   | 14 --------------
 core/dovecot/Dockerfile_LOCAL_7007  | 14 --------------
 core/dovecot/Dockerfile_REMOTE_7007 | 15 ---------------
 4 files changed, 62 deletions(-)
 delete mode 100644 core/dovecot/Dockerfile_BACKUP_7007
 delete mode 100644 core/dovecot/Dockerfile_BASE_7007
 delete mode 100644 core/dovecot/Dockerfile_LOCAL_7007
 delete mode 100644 core/dovecot/Dockerfile_REMOTE_7007

diff --git a/core/dovecot/Dockerfile_BACKUP_7007 b/core/dovecot/Dockerfile_BACKUP_7007
deleted file mode 100644
index b5590a73..00000000
--- a/core/dovecot/Dockerfile_BACKUP_7007
+++ /dev/null
@@ -1,19 +0,0 @@
-<<<<<<< HEAD
-FROM alpine:3.7
-=======
-FROM alpine:3.8
->>>>>>> upstream/master
-
-RUN apk add --no-cache \
-     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
-     python3 py3-pip \
- && pip3 install --upgrade pip \
- && pip3 install jinja2 podop tenacity
-
-COPY conf /conf
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-VOLUME ["/data", "/mail"]
-
-CMD /start.py
\ No newline at end of file
diff --git a/core/dovecot/Dockerfile_BASE_7007 b/core/dovecot/Dockerfile_BASE_7007
deleted file mode 100644
index cacfe354..00000000
--- a/core/dovecot/Dockerfile_BASE_7007
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM alpine:edge
-
-RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --no-cache \
-     dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
-     rspamd-client@testing python py-jinja2
-
-COPY conf /conf
-COPY sieve /var/lib/dovecot
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-
-CMD /start.py
diff --git a/core/dovecot/Dockerfile_LOCAL_7007 b/core/dovecot/Dockerfile_LOCAL_7007
deleted file mode 100644
index 29957921..00000000
--- a/core/dovecot/Dockerfile_LOCAL_7007
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM alpine:3.7
-
-RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
- && apk add --no-cache \
-     dovecot dovecot-sqlite dovecot-pigeonhole-plugin dovecot-pigeonhole-plugin-extdata \
-     rspamd-client@testing python py-jinja2
-
-COPY conf /conf
-COPY sieve /var/lib/dovecot
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-
-CMD /start.py
\ No newline at end of file
diff --git a/core/dovecot/Dockerfile_REMOTE_7007 b/core/dovecot/Dockerfile_REMOTE_7007
deleted file mode 100644
index d8d4c55b..00000000
--- a/core/dovecot/Dockerfile_REMOTE_7007
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM alpine:3.8
-
-RUN apk add --no-cache \
-     dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
-     python3 py3-pip \
- && pip3 install --upgrade pip \
- && pip3 install jinja2 podop tenacity
-
-COPY conf /conf
-COPY start.py /start.py
-
-EXPOSE 110/tcp 143/tcp 993/tcp 4190/tcp 2525/tcp
-VOLUME ["/data", "/mail"]
-
-CMD /start.py

From b3c7c45140f4c8d1e019ecff9db5c5f623b6f8ff Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Wed, 17 Oct 2018 15:11:55 +0300
Subject: [PATCH 21/53] Added input form constraints

---
 setup/flavors/compose/docker-compose.yml      |  4 ++--
 setup/flavors/compose/mailu.env               |  6 ++---
 .../config.html}                              | 22 +++++++++++++------
 .../templates/steps/{ => compose}/expose.html | 12 +++++++---
 .../templates/steps/{ => compose}/flavor.html |  0
 .../steps/{ => compose}/optional.html         |  0
 .../steps/{ => compose}/services.html         | 21 ++++++++++++------
 setup/templates/wizard.html                   | 10 ++++-----
 8 files changed, 48 insertions(+), 27 deletions(-)
 rename setup/templates/steps/{initial-config.html => compose/config.html} (71%)
 rename setup/templates/steps/{ => compose}/expose.html (67%)
 rename setup/templates/steps/{ => compose}/flavor.html (100%)
 rename setup/templates/steps/{ => compose}/optional.html (100%)
 rename setup/templates/steps/{ => compose}/services.html (77%)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 83a46169..8316e681 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -20,7 +20,7 @@ services:
     env_file: {{ env }}
     env:
       - TLS_FLAVOR={{ tls_flavor }}
-      - ADMIN={{ admin_enabled or 'no' }}
+      - ADMIN={{ admin_enabled or 'false' }}
     ports:
     {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
     {% if bind4 %}
@@ -112,7 +112,7 @@ services:
   {% endif %}
 
   # Webmail
-  {% if webmail_enabled %}
+  {% if webmail_type != 'none' %}
   webmail:
     image: mailu/{{ webmail_type }}:{{ version }}
     restart: always
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index b1cded1c..77da5670 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -33,8 +33,9 @@ POSTMASTER={{ postmaster or 'admin'}}
 HOSTNAMES={{ hostnames }}
 
 # Authentication rate limit (per source IP address)
-AUTH_RATELIMIT={% if auth_ratelimit_pm %}{{ auth_ratelimit_pm }}/minute;{% endif %}
-{% if auth_ratelimit_ph %}{{ auth_ratelimit_ph }}/hour{% endif %} 
+{% if auth_ratelimit_pm > '0' and auth_ratelimit_ph > '0' %}
+AUTH_RATELIMIT={{ auth_ratelimit_pm }}/minute;{{ auth_ratelimit_ph }}/hour 
+{% endif %}
 
 # Opt-out of statistics, replace with "True" to opt out
 DISABLE_STATISTICS={{ disable_statistics or 'False' }}
@@ -47,7 +48,6 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
 #ADMIN={{ admin_enabled or 'false' }}
 
 #Chose which webmail to run if any
-#WEBMAIL_ENABLED={{ webmail_enabled or 'false' }}
 #WEBMAIL={{ webmail_type or 'none' }}
 
 #Antivirus solution
diff --git a/setup/templates/steps/initial-config.html b/setup/templates/steps/compose/config.html
similarity index 71%
rename from setup/templates/steps/initial-config.html
rename to setup/templates/steps/compose/config.html
index c16d4c13..f5a39a5a 100644
--- a/setup/templates/steps/initial-config.html
+++ b/setup/templates/steps/compose/config.html
@@ -3,12 +3,15 @@
 
 <div class="form-group">
   <label>Root path: </label>
-  <input class="form-control" type="text" name="root" value="/mailu">
+<!--   Validates path -->
+  <input class="form-control" type="text" name="root" value="/mailu" required pattern="^/[-_A-Za-z0-9]+(/[-_A-Za-z0-9]*)*">
 </div>
 
 <div class="form-group">
   <label>Main mail domain</label>
-  <input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io">
+<!--   Validates domain name -->
+  <input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io" 
+  		required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$">
 </div>
 
 <div class="form-check form-check-inline">
@@ -20,7 +23,7 @@
 
 <div class="form-group">
   <label>Postmaster local part (will append the main mail domain)</label>
-  <input class="form-control" type="text" name="postmaster" value="admin">
+  <input class="form-control" type="text" name="postmaster" value="admin" required>
 </div>
 
 <div class="form-group">
@@ -35,8 +38,11 @@
 
 <div class="form-group">
   <label>Authentication rate limit (per source IP address)</label>
-  <p><input class="form-control" style="width: 7%; display: inline;" type="text" name="auth_ratelimit_pm">/minute;
-  <input class="form-control" style="width: 7%; display: inline;;" type="text" name="auth_ratelimit_ph">/hour</p>
+<!--   Validates number input only -->
+  <p><input class="form-control" style="width: 7%; display: inline;" type="number" name="auth_ratelimit_pm" 
+  		value="10" required >/minute;
+  <input class="form-control" style="width: 7%; display: inline;;" type="number" name="auth_ratelimit_ph"
+  		value="1000" required >/hour</p>
 </div>
 
 <div class="form-check form-check-inline">
@@ -48,12 +54,14 @@
 
 <div class="form-group">
   <label>Website name</label>
-  <input class="form-control" type="text" name="site_name" value="Mailu">
+  <input class="form-control" type="text" name="site_name" value="Mailu" required>
 </div>
 
 <div class="form-group">
   <label>Linked Website URL</label>
-  <input class="form-control" type="text" name="website" value="https://mailu.io">
+<!--   Validates url with or without https:// -->
+  <input class="form-control" type="url" name="website" value="https://mailu.io" required
+  		pattern="^(https?://)?([a-zA-Z0-9]([a-zA-ZäöüÄÖÜ0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$">
 </div>
 
 {% endcall %}
diff --git a/setup/templates/steps/expose.html b/setup/templates/steps/compose/expose.html
similarity index 67%
rename from setup/templates/steps/expose.html
rename to setup/templates/steps/compose/expose.html
index 372ebddc..e0aa8fee 100644
--- a/setup/templates/steps/expose.html
+++ b/setup/templates/steps/compose/expose.html
@@ -14,12 +14,16 @@ avoid generic all-interfaces addresses like <code>0.0.0.0</code> or <code>::</co
 
 <div class="form-group">
   <label>IPv4 listen address</label>
-  <input class="form-control" type="text" name="bind4" placeholder="1.2.3.4">
+<!--   Validates IPv4 address -->
+  <input class="form-control" type="text" name="bind4" value="127.0.0.1" required
+  		pattern="^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
 </div>
 
 <div class="form-group">
   <label>IPv6 listen address</label>
-  <input class="form-control" type="text" name="bind6" placeholder="2001:be4:1234::1">
+<!--   Validates IPv6 address -->
+  <input class="form-control" type="text" name="bind6" value="::1"
+  		pattern="/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})\z/i">
 </div>
 
 <p>You server will be available under a main hostname but may expose multiple public
@@ -28,6 +32,8 @@ hostnames in its <code>MX</code> record. Hostnames must be coma-separated.</p>
 
 <div class="form-group">
   <label>Public hostnames</label>
-  <input class="form-control" type="text" name="hostnames" placeholder="my.host.name,other.host.name" multiple>
+<!--   Validates hostname or list of hostnames -->
+  <input class="form-control" type="text" name="hostnames" placeholder="my.host.name,other.host.name" multiple required
+    	pattern="^(?:(?:\w+(?:-+\w+)*\.)+[a-z]+)*(?:,(?:(?:\w+(?:-+\w+)*\.)+[a-z]+)\s*)*$">
 </div>
 {% endcall %}
diff --git a/setup/templates/steps/flavor.html b/setup/templates/steps/compose/flavor.html
similarity index 100%
rename from setup/templates/steps/flavor.html
rename to setup/templates/steps/compose/flavor.html
diff --git a/setup/templates/steps/optional.html b/setup/templates/steps/compose/optional.html
similarity index 100%
rename from setup/templates/steps/optional.html
rename to setup/templates/steps/compose/optional.html
diff --git a/setup/templates/steps/services.html b/setup/templates/steps/compose/services.html
similarity index 77%
rename from setup/templates/steps/services.html
rename to setup/templates/steps/compose/services.html
index ed529c83..d8ec8106 100644
--- a/setup/templates/steps/services.html
+++ b/setup/templates/steps/compose/services.html
@@ -18,16 +18,23 @@ manage your email domains, users, etc.</p>
 email client. These do add some complexity but provide an easier way of
 accessing messages for beginner users.</p>
 
+<!-- 	Switched from radio buttons to dropdown menu in order to remove the checkbox -->
 <div class="form-group">
   <label>Enable Web email client (and path to the Web email client)</label>
-  <div class="input-group">
-    <div class="input-group-addon"><input type="checkbox" name="webmail_enabled" value="true"></div>
-    <input class="form-control" type="text" name="webmail_path" value="/webmail">
-  </div>
+<!--   <div class="radio"> -->
+<!--     {{ macros.radio("webmail_type", "roundcube", "RoundCube", "popular Webmail running on top of PHP") }} -->
+<!--     {{ macros.radio("webmail_type", "rainloop", "Rainloop", "lightweight Webmail based on PHP, no database") }} -->
+<!--   </div> -->
+  <br/>
+  <select name="webmail_type">
+  	{% for webmailtype in ["none", "roundcube", "rainloop"] %}
+  	<option value="{{ webmailtype }}" >{{ webmailtype }}</option>
+  	{% endfor %}
+  </select>
   <p></p>
-  <div class="radio">
-    {{ macros.radio("webmail_type", "roundcube", "RoundCube", "popular Webmail running on top of PHP") }}
-    {{ macros.radio("webmail_type", "rainloop", "Rainloop", "lightweight Webmail based on PHP, no database") }}
+  <div class="input-group">
+<!--     <div class="input-group-addon"><input type="checkbox" name="webmail_enabled" value="true"></div> -->
+    <input class="form-control" type="text" name="webmail_path" value="/webmail">
   </div>
 </div>
 
diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html
index 5a15af6f..1c85a0ad 100644
--- a/setup/templates/wizard.html
+++ b/setup/templates/wizard.html
@@ -9,11 +9,11 @@
   {% endcall %}
 
   <form method="post" action="{{ url_for(".submit") }}">
-  {% include "steps/initial-config.html" %}
-  {% include "steps/flavor.html" %}
-  {% include "steps/expose.html" %}
-  {% include "steps/services.html" %}
-<!--   {% include "steps/optional.html" %} -->
+  {% include "steps/compose/flavor.html" %}
+  {% include "steps/compose/config.html" %}
+  {% include "steps/compose/services.html" %}
+  {% include "steps/compose/expose.html" %}
+<!--   {% include "steps/compose/optional.html" %} -->
 
   <input class="btn btn-primary" type="submit" value="Setup Mailu">
   </form>

From 6b6cbcf977002f768827389f035ab45fde1c4c15 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Wed, 17 Oct 2018 15:38:51 +0300
Subject: [PATCH 22/53] Modified variables in .env file

---
 setup/flavors/compose/mailu.env           | 27 ++++++++++++++---------
 setup/templates/steps/compose/config.html |  2 +-
 setup/templates/steps/compose/expose.html |  2 +-
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 77da5670..a577f979 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -65,26 +65,24 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
 
 # Message size limit in bytes
 # Default: accept messages up to 50MB
-MESSAGE_SIZE_LIMIT={{ message_size_limit }}
+MESSAGE_SIZE_LIMIT={{ message_size_limit or '50000000' }}
 
 # Networks granted relay permissions, make sure that you include your Docker
 # internal network (default to 172.17.0.0/16)
-RELAYNETS={{ relaynets }}
+RELAYNETS={{ relaynets or '172.17.0.0/16'}}
 
 # Will relay all outgoing mails if configured
 RELAYHOST={{ relayhost }}
 
 # Fetchmail delay
-FETCHMAIL_DELAY={{ fetchmail_delay }}
+FETCHMAIL_DELAY={{ fetchmail_delay or '600' }}
 
 # Recipient delimiter, character used to delimiter localpart from custom address part
-RECIPIENT_DELIMITER={{ recipient_delimiter }}
+RECIPIENT_DELIMITER={{ recipient_delimiter or '+' }}
 
-{% if dmarc_rua or dmarc_ruf %}
 # DMARC rua and ruf email
-{% if dmarc_rua %}DMARC_RUA={{ dmarc_rua }}{% endif %}
-{% if dmarc_ruf %}DMARC_RUF={{ dmarc_ruf }}{% endif %}
-{% endif %}
+DMARC_RUA={{ dmarc_rua or 'admin' }}
+DMARC_RUF={{ dmarc_ruf or 'admin' }}
 
 {% if welcome_enabled %}
 # Welcome email, enable and set a topic and body if you wish to send welcome
@@ -94,6 +92,12 @@ WELCOME_SUBJECT={{ welcome_subject }}
 WELCOME_BODY={{ welcome_body }}
 {% endif %}
 
+# Maildir Compression
+# choose compression-method, default: none (value: bz2, gz)
+COMPRESSION={{ compression }}
+# change compression-level, default: 6 (value: 1-9)
+COMPRESSION_LEVEL={{ compression_level }}
+
 {% if domain_registration %}
 # Domain registration (remove to disable)
 DOMAIN_REGISTRATION=true
@@ -125,13 +129,14 @@ WEBSITE={{ website }}
 # Advanced settings
 ###################################
 
-{% if password_scheme %}
 # Specific password storage scheme
-PASSWORD_SCHEME={{ password_scheme }}
-{% endif %}
+PASSWORD_SCHEME={{ password_scheme or 'SHA512-CRYPT'}}
 
 # Header to take the real ip from
 REAL_IP_HEADER={{ real_ip_header }}
 
 # IPs for nginx set_real_ip_from (CIDR list separated by commas)
 REAL_IP_FROM={{ real_ip_from }}
+
+# choose wether mailu bounces (no) or rejects (yes) mail when recipient is unknown (value: yes, no)
+REJECT_UNLISTED_RECIPIENT={{ reject_unlisted_recipient }}
diff --git a/setup/templates/steps/compose/config.html b/setup/templates/steps/compose/config.html
index f5a39a5a..8d613d08 100644
--- a/setup/templates/steps/compose/config.html
+++ b/setup/templates/steps/compose/config.html
@@ -1,4 +1,4 @@
-{% call macros.panel("info", "Step 0 - Initial configuration") %}
+{% call macros.panel("info", "Step 2 - Initial configuration") %}
 <p>Before starting some variables must be st</p>
 
 <div class="form-group">
diff --git a/setup/templates/steps/compose/expose.html b/setup/templates/steps/compose/expose.html
index e0aa8fee..6bc2f528 100644
--- a/setup/templates/steps/compose/expose.html
+++ b/setup/templates/steps/compose/expose.html
@@ -1,4 +1,4 @@
-{% call macros.panel("info", "Step 2 - expose Mailu to the world") %}
+{% call macros.panel("info", "Step 4 - expose Mailu to the world") %}
 <p>A mail server must be exposed to the world to receive emails, send emails,
 and let users access their mailboxes. Mailu has some flexibility in the way
 you expose it to the world.</p>

From cb1ed349bf15f13690416583816ff0f6a8b8c117 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Wed, 17 Oct 2018 16:46:20 +0300
Subject: [PATCH 23/53] Bug fixes

---
 setup/flavors/compose/docker-compose.yml | 10 ++--------
 setup/flavors/compose/mailu.env          |  8 ++++----
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 8316e681..3d84e595 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -2,7 +2,7 @@
 # This file is auto-generated by the Mailu configuration wizard.
 # Please read the documentation before attempting any change.
 
-version: '3.7'
+version: '3.6'
 
 services:
 
@@ -18,7 +18,7 @@ services:
     image: mailu/nginx:{{ version }}
     restart: always
     env_file: {{ env }}
-    env:
+    environment:
       - TLS_FLAVOR={{ tls_flavor }}
       - ADMIN={{ admin_enabled or 'false' }}
     ports:
@@ -30,10 +30,8 @@ services:
       - "{{ bind6 }}:{{ port }}:{{ port }}"
     {% endif %}
     {% endfor %}
-    {% if flavor in ('cert', 'mail') %}
     volumes:
       - "{{ root }}/certs:/certs"
-    {% endif %}
 
   admin:
     image: mailu/admin:{{ version }}
@@ -54,7 +52,6 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "{{ root }}/data:/data"
       - "{{ root }}/mail:/mail"
       - "{{ root }}/overrides:/overrides"
     depends_on:
@@ -65,7 +62,6 @@ services:
     restart: always
     env_file: {{ env }}
     volumes:
-      - "{{ root }}/data:/data"
       - "{{ root }}/overrides:/overrides"
     depends_on:
       - front
@@ -107,8 +103,6 @@ services:
     image: mailu/fetchmail:{{ version }}
     restart: always
     env_file: {{ env }}
-    volumes:
-      - "{{ root }}/data:/data"
   {% endif %}
 
   # Webmail
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index a577f979..55def163 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -21,7 +21,7 @@ SECRET_KEY={{ secret(16) }}
 # PUBLIC_IPV6= {{ bind6 }} (default: ::1)
 
 # Main mail domain
-# DOMAIN={{ domain }}
+DOMAIN={{ domain }}
 
 # Mail address of the postmaster
 POSTMASTER={{ postmaster or 'admin'}}
@@ -48,16 +48,16 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
 #ADMIN={{ admin_enabled or 'false' }}
 
 #Chose which webmail to run if any
-#WEBMAIL={{ webmail_type or 'none' }}
+WEBMAIL={{ webmail_type }}
 
 #Antivirus solution
 #ANTIVIRUS={{ antivirus_enabled or 'none' }}
 
 #Antispam solution
-#ANTISPAM={{ antispam_enabled or 'none'}}
+ANTISPAM={{ antispam_enabled or 'none'}}
 
 #Dav server implementation
-#WEBDAV={{ webdav_enabled or 'none' }}
+WEBDAV={{ webdav_enabled or 'none' }}
 
 ###################################
 # Server behavior

From 7c0f5b20d6e196f71cda5d4d38773810a15cdaf1 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Wed, 17 Oct 2018 17:54:37 +0300
Subject: [PATCH 24/53] Bug fixes

---
 setup/templates/steps/compose/expose.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/templates/steps/compose/expose.html b/setup/templates/steps/compose/expose.html
index 6bc2f528..df121c7d 100644
--- a/setup/templates/steps/compose/expose.html
+++ b/setup/templates/steps/compose/expose.html
@@ -15,7 +15,7 @@ avoid generic all-interfaces addresses like <code>0.0.0.0</code> or <code>::</co
 <div class="form-group">
   <label>IPv4 listen address</label>
 <!--   Validates IPv4 address -->
-  <input class="form-control" type="text" name="bind4" value="127.0.0.1" required
+  <input class="form-control" type="text" name="bind4" value="127.0.0.1" 
   		pattern="^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$">
 </div>
 
@@ -23,7 +23,7 @@ avoid generic all-interfaces addresses like <code>0.0.0.0</code> or <code>::</co
   <label>IPv6 listen address</label>
 <!--   Validates IPv6 address -->
   <input class="form-control" type="text" name="bind6" value="::1"
-  		pattern="/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})\z/i">
+  		pattern="^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8]))?$">
 </div>
 
 <p>You server will be available under a main hostname but may expose multiple public

From ed53d655d3977c8e7794ec66eeac38881c541cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Wed, 17 Oct 2018 18:38:10 +0300
Subject: [PATCH 25/53] Extend documentation in download page. Small cleanup in
 env.

---
 setup/flavors/compose/mailu.env  |  2 +-
 setup/flavors/compose/setup.html | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 55def163..fba5bee8 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -24,7 +24,7 @@ SECRET_KEY={{ secret(16) }}
 DOMAIN={{ domain }}
 
 # Mail address of the postmaster
-POSTMASTER={{ postmaster or 'admin'}}
+POSTMASTER={{ postmaster }}
 
 #Chose how secure connections will behave:
 #TLS_FLAVOR={{ tls_flavor }}
diff --git a/setup/flavors/compose/setup.html b/setup/flavors/compose/setup.html
index 3c190c9c..d5f7abc5 100644
--- a/setup/flavors/compose/setup.html
+++ b/setup/flavors/compose/setup.html
@@ -11,8 +11,8 @@ in a project directory. First create your project directory.</p>
 to read and check the configuration variables generated by the wizard.</p>
 
 <pre><code>cd {{ root }}
-wget {{ url_for('.file', uid=uid, filepath='docker-compose.yml', _external=True) }}
-wget {{ url_for('.file', uid=uid, filepath='mailu.env', _external=True) }}
+curl {{ url_for('.file', uid=uid, filepath='docker-compose.yml', _external=True) }} > docker-compose.yml
+curl {{ url_for('.file', uid=uid, filepath='mailu.env', _external=True) }} > mailu.env
 </pre></code>
 {% endcall %}
 
@@ -33,4 +33,17 @@ command.</p>
 <pre><code>cd {{ root }}
 docker-compose up -d
 </pre></code>
+
+Before you can use Mailu, you must create the primary administrator user account. This should be {{ postmaster }}@{{ domain }}. Use the following command, changing PASSWORD to your liking:
+
+<pre><code>docker-compose exec admin python manage.py admin {{ postmaster }} {{ domain }} PASSWORD
+</pre></code>
+
+Login the the admin interface to change the password for a safe one, at
+{% if admin_enabled %}
+one of the hostnames ({{ hostnames }}){{ admin_path }}.
+{% else %}
+http://127.0.0.1:8080 (only directly from the host running docker).
+{% endif %}
+And choose the "Update password" option in the left menu.
 {% endcall %}

From 0a5dbf6230d9749dbf1a1129b606abe6f4dad0fc Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 17 Oct 2018 17:41:21 +0200
Subject: [PATCH 26/53] Re-enable local dovecot sieve scripts

---
 core/dovecot/conf/dovecot.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/dovecot/conf/dovecot.conf b/core/dovecot/conf/dovecot.conf
index d6c4eb21..a9ec2676 100644
--- a/core/dovecot/conf/dovecot.conf
+++ b/core/dovecot/conf/dovecot.conf
@@ -136,7 +136,8 @@ service managesieve {
 }
 
 plugin {
-  sieve = dict:proxy:/tmp/podop.socket:sieve
+  sieve = file:~/sieve;active=~/.dovecot.sieve
+  sieve_before = dict:proxy:/tmp/podop.socket:sieve
   sieve_plugins = sieve_imapsieve sieve_extprograms
   sieve_extensions = +spamtest +spamtestplus +editheader
   sieve_global_extensions = +vnd.dovecot.execute

From 5679d355aafa14cdce652e5dc50a3e053f1e1a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Wed, 17 Oct 2018 18:45:09 +0300
Subject: [PATCH 27/53] Avoid binding conflicts on production servers

---
 setup/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup/docker-compose.yml b/setup/docker-compose.yml
index 30966167..e91332e1 100644
--- a/setup/docker-compose.yml
+++ b/setup/docker-compose.yml
@@ -9,6 +9,6 @@ services:
   setup:
     image: mailu/setup
     ports:
-      - "80:80"
+      - "8000:80"
     build: .
 

From b9b4a8cd77c4a483d7dbf70314db777f021f0443 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 17 Oct 2018 18:47:55 +0200
Subject: [PATCH 28/53] Explicitely specify the fuzzy worker listen address

---
 services/rspamd/conf/worker-fuzzy.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/rspamd/conf/worker-fuzzy.inc b/services/rspamd/conf/worker-fuzzy.inc
index a0021a03..0f71ba32 100644
--- a/services/rspamd/conf/worker-fuzzy.inc
+++ b/services/rspamd/conf/worker-fuzzy.inc
@@ -1,4 +1,5 @@
 type = "fuzzy";
+bind_socket = "*:11335";
 count = 1;
 backend = "redis";
 expire = 90d;

From ce0bf3366d2193b01e34c04ede5f870c94d250c3 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 17 Oct 2018 18:48:28 +0200
Subject: [PATCH 29/53] Learn fuzzy hashes automatically

---
 core/dovecot/Dockerfile             | 2 +-
 core/dovecot/conf/bin/ham           | 4 ++++
 core/dovecot/conf/bin/mailtrain     | 3 ---
 core/dovecot/conf/bin/spam          | 4 ++++
 core/dovecot/conf/report-ham.sieve  | 2 +-
 core/dovecot/conf/report-spam.sieve | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)
 create mode 100755 core/dovecot/conf/bin/ham
 delete mode 100755 core/dovecot/conf/bin/mailtrain
 create mode 100755 core/dovecot/conf/bin/spam

diff --git a/core/dovecot/Dockerfile b/core/dovecot/Dockerfile
index d8d4c55b..41437e23 100644
--- a/core/dovecot/Dockerfile
+++ b/core/dovecot/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.8
 
 RUN apk add --no-cache \
      dovecot dovecot-pigeonhole-plugin dovecot-fts-lucene rspamd-client \
-     python3 py3-pip \
+     bash python3 py3-pip \
  && pip3 install --upgrade pip \
  && pip3 install jinja2 podop tenacity
 
diff --git a/core/dovecot/conf/bin/ham b/core/dovecot/conf/bin/ham
new file mode 100755
index 00000000..c74a97bd
--- /dev/null
+++ b/core/dovecot/conf/bin/ham
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+tee >(rspamc -h antispam:11334 -P mailu learn_ham /dev/stdin) \
+    | rspamc -h antispam:11334 -P mailu -f 13 fuzzy_add /dev/stdin
\ No newline at end of file
diff --git a/core/dovecot/conf/bin/mailtrain b/core/dovecot/conf/bin/mailtrain
deleted file mode 100755
index cfa36398..00000000
--- a/core/dovecot/conf/bin/mailtrain
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-rspamc -h antispam:11334 -P mailu "learn_$1" /dev/stdin <&0
diff --git a/core/dovecot/conf/bin/spam b/core/dovecot/conf/bin/spam
new file mode 100755
index 00000000..e6a66f89
--- /dev/null
+++ b/core/dovecot/conf/bin/spam
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+tee >(rspamc -h antispam:11334 -P mailu learn_spam /dev/stdin) \
+    >(rspamc -h antispam:11334 -P mailu -f 11 fuzzy_add /dev/stdin)
\ No newline at end of file
diff --git a/core/dovecot/conf/report-ham.sieve b/core/dovecot/conf/report-ham.sieve
index 1ad8abdf..0c69d67b 100644
--- a/core/dovecot/conf/report-ham.sieve
+++ b/core/dovecot/conf/report-ham.sieve
@@ -8,4 +8,4 @@ if string "${mailbox}" "Trash" {
   stop;
 }
 
-execute :pipe "mailtrain" "ham";
+execute :pipe "ham";
diff --git a/core/dovecot/conf/report-spam.sieve b/core/dovecot/conf/report-spam.sieve
index b2a544a6..108d6210 100644
--- a/core/dovecot/conf/report-spam.sieve
+++ b/core/dovecot/conf/report-spam.sieve
@@ -1,3 +1,3 @@
 require "vnd.dovecot.execute";
 
-execute :pipe "mailtrain" "spam";
+execute :pipe "spam";

From d5162328eca5e2344c4ca1e432ec8f31bc5b7e1f Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 17 Oct 2018 18:48:59 +0200
Subject: [PATCH 30/53] Allow dovecot to write the source configuration
 directory for compiling sieve scripts

---
 core/dovecot/start.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dovecot/start.py b/core/dovecot/start.py
index afd0513e..b65b4db9 100755
--- a/core/dovecot/start.py
+++ b/core/dovecot/start.py
@@ -36,5 +36,5 @@ for dovecot_file in glob.glob("/conf/*.conf"):
 
 # Run Podop, then postfix
 multiprocessing.Process(target=start_podop).start()
-os.system("chown -R mail:mail /mail /var/lib/dovecot")
+os.system("chown -R mail:mail /mail /var/lib/dovecot /conf")
 os.execv("/usr/sbin/dovecot", ["dovecot", "-c", "/etc/dovecot/dovecot.conf", "-F"])

From 86bdce840774f7c7170d4eccfc7dc9e9d3d9ea5e Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Wed, 17 Oct 2018 18:49:19 +0000
Subject: [PATCH 31/53] Explicitely specify the fuzzy worker listen address

---
 services/rspamd/conf/worker-fuzzy.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/rspamd/conf/worker-fuzzy.inc b/services/rspamd/conf/worker-fuzzy.inc
index a0021a03..0f71ba32 100644
--- a/services/rspamd/conf/worker-fuzzy.inc
+++ b/services/rspamd/conf/worker-fuzzy.inc
@@ -1,4 +1,5 @@
 type = "fuzzy";
+bind_socket = "*:11335";
 count = 1;
 backend = "redis";
 expire = 90d;

From dba8f1810d3d9271ff9ca9dcc21521d3bef7327c Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 17 Oct 2018 21:21:00 +0200
Subject: [PATCH 32/53] Do not check the password another time in Dovecot

---
 core/admin/mailu/internal/views/dovecot.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/admin/mailu/internal/views/dovecot.py b/core/admin/mailu/internal/views/dovecot.py
index c2f53794..036140f0 100644
--- a/core/admin/mailu/internal/views/dovecot.py
+++ b/core/admin/mailu/internal/views/dovecot.py
@@ -1,14 +1,24 @@
-from mailu import db, models
+from mailu import db, models, app
 from mailu.internal import internal
 
 import flask
+import socket
 
 
 @internal.route("/dovecot/passdb/<user_email>")
 def dovecot_passdb_dict(user_email):
     user = models.User.query.get(user_email) or flask.abort(404)
+    allow_nets = []
+    allow_nets.append(
+        app.config.get("POD_ADDRESS_RANGE") or
+        socket.gethostbyname(app.config["HOST_FRONT"])
+    )
+    allow_nets.append(socket.gethostbyname(app.config["HOST_WEBMAIL"]))
+    print(allow_nets)
     return flask.jsonify({
-        "password": user.password,
+        "password": None,
+        "nopassword": "Y",
+        "allow_nets": ",".join(allow_nets)
     })
 
 

From 988e09e65eecab6daae5f090556826b0310a434a Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 17 Oct 2018 21:21:24 +0200
Subject: [PATCH 33/53] Add a profiler in debug mode for improving performance

---
 core/admin/mailu/__init__.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/admin/mailu/__init__.py b/core/admin/mailu/__init__.py
index 167f04ae..a73e6ab9 100644
--- a/core/admin/mailu/__init__.py
+++ b/core/admin/mailu/__init__.py
@@ -12,7 +12,7 @@ import docker
 import socket
 import uuid
 
-from werkzeug.contrib import fixers
+from werkzeug.contrib import fixers, profiler
 
 # Create application
 app = flask.Flask(__name__)
@@ -62,7 +62,10 @@ default_config = {
     'HOST_IMAP': 'imap',
     'HOST_POP3': 'imap',
     'HOST_SMTP': 'smtp',
+    'HOST_WEBMAIL': 'webmail',
+    'HOST_FRONT': 'front',
     'HOST_AUTHSMTP': os.environ.get('HOST_SMTP', 'smtp'),
+    'POD_ADDRESS_RANGE': None
 }
 
 # Load configuration from the environment if available
@@ -80,6 +83,10 @@ if app.config.get("DEBUG"):
     import flask_debugtoolbar
     toolbar = flask_debugtoolbar.DebugToolbarExtension(app)
 
+# Profiler
+if app.config.get("DEBUG"):
+    app.wsgi_app = profiler.ProfilerMiddleware(app.wsgi_app, restrictions=[30])
+
 # Manager commnad
 manager = flask_script.Manager(app)
 manager.add_command('db', flask_migrate.MigrateCommand)
@@ -129,4 +136,5 @@ class PrefixMiddleware(object):
             environ['SCRIPT_NAME'] = prefix
         return self.app(environ, start_response)
 
+
 app.wsgi_app = PrefixMiddleware(fixers.ProxyFix(app.wsgi_app))

From 01fa1797674e2badeaa42292172807107338c41a Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 17 Oct 2018 21:21:35 +0200
Subject: [PATCH 34/53] Update the user password in database when needed

---
 core/admin/mailu/models.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 0c80fd4f..51d07f24 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -276,7 +276,8 @@ class User(Base, Email):
         else:
             return self.email
 
-    scheme_dict = {'BLF-CRYPT': "bcrypt",
+    scheme_dict = {'PBKDF2': "pbkdf2_sha512",
+                   'BLF-CRYPT': "bcrypt",
                    'SHA512-CRYPT': "sha512_crypt",
                    'SHA256-CRYPT': "sha256_crypt",
                    'MD5-CRYPT': "md5_crypt",
@@ -287,8 +288,14 @@ class User(Base, Email):
     )
 
     def check_password(self, password):
+        context = User.pw_context
         reference = re.match('({[^}]+})?(.*)', self.password).group(2)
-        return User.pw_context.verify(password, reference)
+        result = context.verify(password, reference)
+        if result and context.identify(reference) != context.default_scheme():
+            self.set_password(password)
+            db.session.add(self)
+            db.session.commit()
+        return result
 
     def set_password(self, password, hash_scheme=app.config['PASSWORD_SCHEME'], raw=False):
         """Set password for user with specified encryption scheme

From 828d96f8f01da044611950b3df57137ef1797c11 Mon Sep 17 00:00:00 2001
From: kaiyou <pierre@jaury.eu>
Date: Wed, 17 Oct 2018 21:26:44 +0200
Subject: [PATCH 35/53] Switch the default password scheme to PBKDF2

---
 docs/compose/.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/compose/.env b/docs/compose/.env
index 7823bc3e..ce8e9eb9 100644
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -130,8 +130,8 @@ LOG_DRIVER=json-file
 COMPOSE_PROJECT_NAME=mailu
 
 # Default password scheme used for newly created accounts and changed passwords
-# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
-PASSWORD_SCHEME=BLF-CRYPT
+# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
+PASSWORD_SCHEME=PBKDF2
 
 # Header to take the real ip from
 REAL_IP_HEADER=

From adfadab4cf4d749d6bf95f0b9bd420fa3bc93094 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Thu, 18 Oct 2018 12:56:16 +0300
Subject: [PATCH 36/53] Load steps after setting flavor

---
 setup/server.py                                 |  5 +++++
 setup/templates/macros.html                     |  4 ++--
 setup/templates/steps/{compose => }/flavor.html |  8 ++++----
 setup/templates/wizard.html                     | 17 +++++++++++------
 4 files changed, 22 insertions(+), 12 deletions(-)
 rename setup/templates/steps/{compose => }/flavor.html (81%)

diff --git a/setup/server.py b/setup/server.py
index ddeafd90..4e29fe9e 100644
--- a/setup/server.py
+++ b/setup/server.py
@@ -65,6 +65,11 @@ def build_app(path):
         def wizard():
             return flask.render_template('wizard.html')
 
+        @bp.route("/submit_flavor", methods=["POST"])
+        def submit_flavor():
+            data = flask.request.form.copy()
+            return flask.render_template('wizard.html', flavor=data["flavor"])
+
         @bp.route("/submit", methods=["POST"])
         def submit():
             data = flask.request.form.copy()
diff --git a/setup/templates/macros.html b/setup/templates/macros.html
index 579800d2..4af20c4e 100644
--- a/setup/templates/macros.html
+++ b/setup/templates/macros.html
@@ -9,10 +9,10 @@
   </div>
 {% endmacro %}
 
-{% macro radio(name, value, emph, text) %}
+{% macro radio(name, value, emph, text, current) %}
   <div class="radio">
     <label>
-      <input type="radio" name="{{ name }}" value="{{ value }}">
+      <input type="radio" name="{{ name }}" value="{{ value }}"{% if current == value %} checked="checked"{% endif %}>
       {% if emph %}
       <strong>{{ emph }}</strong>,
       {% endif %}
diff --git a/setup/templates/steps/compose/flavor.html b/setup/templates/steps/flavor.html
similarity index 81%
rename from setup/templates/steps/compose/flavor.html
rename to setup/templates/steps/flavor.html
index 66da0757..64aa0158 100644
--- a/setup/templates/steps/compose/flavor.html
+++ b/setup/templates/steps/flavor.html
@@ -7,10 +7,10 @@ developpers, will mostly cover Compose and Stack, while other flavors are
 maintained by specific contributors.</p>
 
 <div class="radio">
-  {{ macros.radio("flavor", "compose", "Compose", "simply using Docker Compose manager") }}
-  {{ macros.radio("flavor", "stack", "Stack", "using stack deployments in a Swarm cluster") }}
-  {{ macros.radio("flavor", "rancher", "Rancher", "on top of the Rancher container manager") }}
-  {{ macros.radio("flavor", "kubernetes", "Kubernetes", "on top of the Kubernetes container manager") }}
+  {{ macros.radio("flavor", "compose", "Compose", "simply using Docker Compose manager", flavor) }}
+  {{ macros.radio("flavor", "stack", "Stack", "using stack deployments in a Swarm cluster", flavor) }}
+  {{ macros.radio("flavor", "rancher", "Rancher", "on top of the Rancher container manager", flavor) }}
+  {{ macros.radio("flavor", "kubernetes", "Kubernetes", "on top of the Kubernetes container manager", flavor) }}
 </div>
 
 {% endcall %}
diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html
index 1c85a0ad..d035a96b 100644
--- a/setup/templates/wizard.html
+++ b/setup/templates/wizard.html
@@ -8,13 +8,18 @@
   ready when using this wizard.
   {% endcall %}
 
+  <form method="post" action="{{ url_for(".submit_flavor") }}">
+  {% include "steps/flavor.html" %}
+  <input class="btn btn-primary" type="submit" value="Next >" style="margin-bottom: 15px">
+  </form>
+  {% if flavor %}
   <form method="post" action="{{ url_for(".submit") }}">
-  {% include "steps/compose/flavor.html" %}
-  {% include "steps/compose/config.html" %}
-  {% include "steps/compose/services.html" %}
-  {% include "steps/compose/expose.html" %}
-<!--   {% include "steps/compose/optional.html" %} -->
-
+  <input type="hidden" name="flavor" value="{{ flavor }}">
+  {% include "steps/" + flavor + "/config.html" %}
+  {% include "steps/" + flavor + "/services.html" %}
+  {% include "steps/" + flavor + "/expose.html" %}
   <input class="btn btn-primary" type="submit" value="Setup Mailu">
+  {% endif %}
+<!--   {% include "steps/compose/optional.html" %} -->
   </form>
 {% endblock %}

From 39a1de956f13ee38541695ca9260d260e9866679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Thu, 18 Oct 2018 14:35:38 +0300
Subject: [PATCH 37/53] Add docker stack flavor - Template still untested -
 mailu.env and setup.html are symbolic links to compose flavor

---
 setup/flavors/stack/docker-compose.yml | 123 +++++++++++++++++++++++++
 setup/flavors/stack/mailu.env          |   1 +
 setup/flavors/stack/setup.html         |   1 +
 3 files changed, 125 insertions(+)
 create mode 100644 setup/flavors/stack/docker-compose.yml
 create mode 120000 setup/flavors/stack/mailu.env
 create mode 120000 setup/flavors/stack/setup.html

diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
new file mode 100644
index 00000000..3f56d571
--- /dev/null
+++ b/setup/flavors/stack/docker-compose.yml
@@ -0,0 +1,123 @@
+version: '3.6'
+
+services:
+
+# External dependencies
+  redis:
+    image: redis:alpine
+    restart: always
+    volumes:
+      - "{{ root }}/redis:/data"
+
+# Core services
+  front:
+    image: mailu/nginx:{{ version }}
+    env_file: {{ env }}
+    ports:
+    {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
+      - target: {{ port }}
+        published: {{ port }}
+        mode: overlay
+    {% endfor %}
+    volumes:
+      - "{{ root }}/certs:/certs"
+    deploy:
+      replicas: 1
+
+  admin:
+    image: mailu/admin:{{ version }}
+    env_file: {{ env }}
+    {% if not admin_enabled %}
+    ports:
+      - 127.0.0.1:8080:80
+    {% endif %}
+    volumes:
+      - "{{ root }}/data:/data"
+      - "{{ root }}/dkim:/dkim"
+    deploy:
+      replicas: 1
+
+  imap:
+    image: mailu/dovecot:{{ version }}
+    env_file: {{ env }}
+    environment:
+    # Default to 10.0.1.0/24
+      - POD_ADDRESS_RANGE={{ subnet }}
+    volumes:
+      - "{{ root }}/mail:/mail"
+      - "{{ root }}/overrides:/overrides"
+    deploy:
+      replicas: 1
+
+  smtp:
+    image: mailu/postfix:{{ version }}
+    env_file: {{ env }}
+    environment:
+      - POD_ADDRESS_RANGE={{ subnet }}
+    volumes:
+      - "{{ root }}/overrides:/overrides"
+    deploy:
+      replicas: 1
+
+  # Optional services
+  {% if antispam_enabled %}
+  antispam:
+    image: mailu/rspamd:{{ version }}
+    env_file: {{ env }}
+    environment:
+      - POD_ADDRESS_RANGE={{ subnet }}
+    volumes:
+      - "{{ root }}/filter:/var/lib/rspamd"
+      - "{{ root }}/dkim:/dkim"
+      - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d"
+    deploy:
+      replicas: 1
+  {% endif %}
+
+  {% if antivirus_enabled %}
+  antivirus:
+    image: mailu/clamav:{{ version }}
+    env_file: {{ env }}
+    volumes:
+      - "{{ root }}/filter:/data"
+    deploy:
+      replicas: 1
+  {% endif %}
+
+  {% if webdav_enabled %}
+  webdav:
+    image: mailu/none:{{ version }}
+    env_file: {{ env }}
+    volumes:
+      - "{{ root }}/dav:/data"
+    deploy:
+      replicas: 1
+  {% endif %}
+
+  {% if fetchmail_enabled %}
+  fetchmail:
+    image: mailu/fetchmail:{{ version }}
+    env_file: {{ env }}
+    volumes:
+      - "{{ root }}/data:/data"
+    deploy:
+      replicas: 1
+  {% endif %}
+
+  {% if webmail_type != 'none' %}
+  webmail:
+    image: mailu/roundcube:{{ version }}
+    env_file: {{ env }}
+    volumes:
+      - "{{ root }}/webmail:/data"
+    deploy:
+      replicas: 1
+  {% endif %}
+
+networks:
+  default:
+    driver: overlay
+    ipam:
+      driver: default
+      config:
+        - subnet: {{ subnet }}
diff --git a/setup/flavors/stack/mailu.env b/setup/flavors/stack/mailu.env
new file mode 120000
index 00000000..7123102b
--- /dev/null
+++ b/setup/flavors/stack/mailu.env
@@ -0,0 +1 @@
+../compose/mailu.env
\ No newline at end of file
diff --git a/setup/flavors/stack/setup.html b/setup/flavors/stack/setup.html
new file mode 120000
index 00000000..ab09944c
--- /dev/null
+++ b/setup/flavors/stack/setup.html
@@ -0,0 +1 @@
+../compose/setup.html
\ No newline at end of file

From d4f32c3e7d1d4150cc25a9e930ad7737521a65d3 Mon Sep 17 00:00:00 2001
From: hoellen <dev@hoellen.eu>
Date: Thu, 18 Oct 2018 14:27:28 +0200
Subject: [PATCH 38/53] remove rewrite if webmail is on root

---
 core/nginx/conf/nginx.conf | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 8fcda1c3..7eaba003 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -91,8 +91,10 @@ http {
       {% endif %}
 
       location {{ WEB_WEBMAIL }} {
+        {% if WEB_WEBMAIL != '/' %}
         rewrite ^({{ WEB_WEBMAIL }})$ $1/ permanent;
         rewrite ^{{ WEB_WEBMAIL }}/(.*) /$1 break;
+        {% endif %}
         include /etc/nginx/proxy.conf;
         client_max_body_size {{ MESSAGE_SIZE_LIMIT|int + 8388608 }};
         proxy_pass http://$webmail;

From 35193f5530ff8e0e1d058cf3077b60fee2f61247 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Thu, 18 Oct 2018 17:23:25 +0300
Subject: [PATCH 39/53] Added functionality for stack flavor

---
 setup/flavors/compose/docker-compose.yml      |  1 +
 setup/flavors/compose/mailu.env               |  2 +
 setup/flavors/stack/docker-compose.yml        |  5 ++
 setup/server.py                               |  3 +-
 setup/templates/base.html                     |  2 +-
 .../compose/{config.html => 01_config.html}   |  4 +-
 .../{services.html => 02_services.html}       |  2 +-
 .../compose/{expose.html => 03_expose.html}   |  0
 setup/templates/steps/compose/optional.html   | 16 ----
 setup/templates/steps/stack/01_config.html    | 67 +++++++++++++++++
 setup/templates/steps/stack/02_services.html  | 73 +++++++++++++++++++
 setup/templates/steps/stack/03_expose.html    | 21 ++++++
 setup/templates/wizard.html                   |  7 +-
 13 files changed, 178 insertions(+), 25 deletions(-)
 rename setup/templates/steps/compose/{config.html => 01_config.html} (95%)
 rename setup/templates/steps/compose/{services.html => 02_services.html} (97%)
 rename setup/templates/steps/compose/{expose.html => 03_expose.html} (100%)
 delete mode 100644 setup/templates/steps/compose/optional.html
 create mode 100644 setup/templates/steps/stack/01_config.html
 create mode 100644 setup/templates/steps/stack/02_services.html
 create mode 100644 setup/templates/steps/stack/03_expose.html

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 3d84e595..4cebdc2c 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -1,6 +1,7 @@
 {% set env='mailu.env' %}
 # This file is auto-generated by the Mailu configuration wizard.
 # Please read the documentation before attempting any change.
+# Generated for {{ flavor }} flavor
 
 version: '3.6'
 
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index fba5bee8..dc788bea 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -1,5 +1,7 @@
 # Mailu main configuration file
 #
+# Generated for {{ flavor }} flavor
+#
 # This file is autogenerated by the configuration management wizard.
 # For a detailed list of configuration variables, see the documentation at
 # https://mailu.io
diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index 3f56d571..f27b661f 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -1,3 +1,8 @@
+{% set env='mailu.env' %}
+# This file is auto-generated by the Mailu configuration wizard.
+# Please read the documentation before attempting any change.
+# Generated for {{ flavor }} flavor
+
 version: '3.6'
 
 services:
diff --git a/setup/server.py b/setup/server.py
index 4e29fe9e..7818e662 100644
--- a/setup/server.py
+++ b/setup/server.py
@@ -68,7 +68,8 @@ def build_app(path):
         @bp.route("/submit_flavor", methods=["POST"])
         def submit_flavor():
             data = flask.request.form.copy()
-            return flask.render_template('wizard.html', flavor=data["flavor"])
+            flavor_files = sorted(os.listdir(path + "/" + version + "/templates/steps/" + data["flavor"]))
+            return flask.render_template('wizard.html', flavor=data["flavor"], flavor_files=flavor_files)
 
         @bp.route("/submit", methods=["POST"])
         def submit():
diff --git a/setup/templates/base.html b/setup/templates/base.html
index d40a4880..5be0b1eb 100644
--- a/setup/templates/base.html
+++ b/setup/templates/base.html
@@ -8,7 +8,7 @@
   <h1>Mailu configuration</h1>
   <p>
     Version
-    <select onchange="window.location.href=this.value;">
+    <select onchange="window.location.href=this.value;" class="btn btn-primary dropdown-toggle">
       {% for available in versions %}
       <option value="{{ url_for('{}.wizard'.format(available)) }}" {% if available == version %}selected{% endif %}>{{ available }}</option>
       {% endfor %}
diff --git a/setup/templates/steps/compose/config.html b/setup/templates/steps/compose/01_config.html
similarity index 95%
rename from setup/templates/steps/compose/config.html
rename to setup/templates/steps/compose/01_config.html
index 8d613d08..cfca8aa7 100644
--- a/setup/templates/steps/compose/config.html
+++ b/setup/templates/steps/compose/01_config.html
@@ -1,5 +1,5 @@
 {% call macros.panel("info", "Step 2 - Initial configuration") %}
-<p>Before starting some variables must be st</p>
+<p>Before starting some variables must be set</p>
 
 <div class="form-group">
   <label>Root path: </label>
@@ -29,7 +29,7 @@
 <div class="form-group">
   <label>Choose how secure connections will behave </label>
   <br/>
-  <select name="tls_flavor">
+  <select class="btn btn-primary dropdown-toggle" name="tls_flavor">
   	{% for tlsflavor in ["letsencrypt", "cert", "notls", "mail", "mail-letsencrypt"] %}
   	<option value="{{ tlsflavor }}" >{{ tlsflavor }}</option>
   	{% endfor %}
diff --git a/setup/templates/steps/compose/services.html b/setup/templates/steps/compose/02_services.html
similarity index 97%
rename from setup/templates/steps/compose/services.html
rename to setup/templates/steps/compose/02_services.html
index d8ec8106..07bca6ba 100644
--- a/setup/templates/steps/compose/services.html
+++ b/setup/templates/steps/compose/02_services.html
@@ -26,7 +26,7 @@ accessing messages for beginner users.</p>
 <!--     {{ macros.radio("webmail_type", "rainloop", "Rainloop", "lightweight Webmail based on PHP, no database") }} -->
 <!--   </div> -->
   <br/>
-  <select name="webmail_type">
+  <select class="btn btn-primary dropdown-toggle" name="webmail_type">
   	{% for webmailtype in ["none", "roundcube", "rainloop"] %}
   	<option value="{{ webmailtype }}" >{{ webmailtype }}</option>
   	{% endfor %}
diff --git a/setup/templates/steps/compose/expose.html b/setup/templates/steps/compose/03_expose.html
similarity index 100%
rename from setup/templates/steps/compose/expose.html
rename to setup/templates/steps/compose/03_expose.html
diff --git a/setup/templates/steps/compose/optional.html b/setup/templates/steps/compose/optional.html
deleted file mode 100644
index b7878b23..00000000
--- a/setup/templates/steps/compose/optional.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% call macros.panel("info", "Step 4 - enable optional features") %}
-<p>Mailu also comes with less common optional features that you might wish
-to enable.</p>
-
-<p>The DAV service enables contacts and calendar storage through Mailu,
-it is especially userful when synchronizing your desktop and mobile devices.</p>
-
-<div class="form-group">
-  <label>Enable the DAV service (and path to the DAV service)</label>
-  <div class="input-group">
-    <div class="input-group-addon"><input type="checkbox" name="dav_enabled" checked></div>
-    <input class="form-control" type="text" name="admin_path" value="/webdav">
-  </div>
-</div>
-
-{% endcall %}
diff --git a/setup/templates/steps/stack/01_config.html b/setup/templates/steps/stack/01_config.html
new file mode 100644
index 00000000..8ada68a7
--- /dev/null
+++ b/setup/templates/steps/stack/01_config.html
@@ -0,0 +1,67 @@
+{% call macros.panel("info", "Step 2 - Initial configuration") %}
+<p>Before starting some variables must be set</p>
+
+<div class="form-group">
+  <label>Root path: </label>
+<!--   Validates path -->
+  <input class="form-control" type="text" name="root" value="/mailu" required pattern="^/[-_A-Za-z0-9]+(/[-_A-Za-z0-9]*)*">
+</div>
+
+<div class="form-group">
+  <label>Main mail domain</label>
+<!--   Validates domain name -->
+  <input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io" 
+  		required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$">
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="domain_registration" value="true">
+    Domain registration
+  </label>
+</div>
+
+<div class="form-group">
+  <label>Postmaster local part (will append the main mail domain)</label>
+  <input class="form-control" type="text" name="postmaster" value="admin" required>
+</div>
+
+<!-- <div class="form-group"> -->
+<!--   <label>Choose how secure connections will behave </label> -->
+<!--   <br/> -->
+<!--   <select name="tls_flavor"> -->
+<!--   	{% for tlsflavor in ["letsencrypt", "cert", "notls", "mail", "mail-letsencrypt"] %} -->
+<!--   	<option value="{{ tlsflavor }}" >{{ tlsflavor }}</option> -->
+<!--   	{% endfor %} -->
+<!--   </select> -->
+<!-- </div> -->
+
+<div class="form-group">
+  <label>Authentication rate limit (per source IP address)</label>
+<!--   Validates number input only -->
+  <p><input class="form-control" style="width: 7%; display: inline;" type="number" name="auth_ratelimit_pm" 
+  		value="10" required >/minute;
+  <input class="form-control" style="width: 7%; display: inline;;" type="number" name="auth_ratelimit_ph"
+  		value="1000" required >/hour</p>
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="disable_statistics" value="True">
+    Opt-out of statistics
+  </label>
+</div>
+
+<div class="form-group">
+  <label>Website name</label>
+  <input class="form-control" type="text" name="site_name" value="Mailu" required>
+</div>
+
+<div class="form-group">
+  <label>Linked Website URL</label>
+<!--   Validates url with or without https:// -->
+  <input class="form-control" type="url" name="website" value="https://mailu.io" required
+  		pattern="^(https?://)?([a-zA-Z0-9]([a-zA-ZäöüÄÖÜ0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$">
+</div>
+
+{% endcall %}
diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html
new file mode 100644
index 00000000..07bca6ba
--- /dev/null
+++ b/setup/templates/steps/stack/02_services.html
@@ -0,0 +1,73 @@
+{% call macros.panel("info", "Step 3 - pick some features") %}
+<p>Mailu comes with multiple base features, including a specific admin
+interface, Web email clients (webmails), antispam, antivirus, etc. If you
+wish to disable some of these features, you are free to do so.</p>
+
+<p>The admin interface is the main Mailu-specific bit, it provides tools to
+manage your email domains, users, etc.</p>
+
+<div class="form-group">
+  <label>Enable the admin UI (and path to the admin UI)</label>
+  <div class="input-group">
+    <div class="input-group-addon"><input type="checkbox" name="admin_enabled" value="true"></div>
+    <input class="form-control" type="text" name="admin_path" value="/admin">
+  </div>
+</div>
+
+<p>Emails will be available through IMAP and POP3. You may also enable a Web
+email client. These do add some complexity but provide an easier way of
+accessing messages for beginner users.</p>
+
+<!-- 	Switched from radio buttons to dropdown menu in order to remove the checkbox -->
+<div class="form-group">
+  <label>Enable Web email client (and path to the Web email client)</label>
+<!--   <div class="radio"> -->
+<!--     {{ macros.radio("webmail_type", "roundcube", "RoundCube", "popular Webmail running on top of PHP") }} -->
+<!--     {{ macros.radio("webmail_type", "rainloop", "Rainloop", "lightweight Webmail based on PHP, no database") }} -->
+<!--   </div> -->
+  <br/>
+  <select class="btn btn-primary dropdown-toggle" name="webmail_type">
+  	{% for webmailtype in ["none", "roundcube", "rainloop"] %}
+  	<option value="{{ webmailtype }}" >{{ webmailtype }}</option>
+  	{% endfor %}
+  </select>
+  <p></p>
+  <div class="input-group">
+<!--     <div class="input-group-addon"><input type="checkbox" name="webmail_enabled" value="true"></div> -->
+    <input class="form-control" type="text" name="webmail_path" value="/webmail">
+  </div>
+</div>
+
+<p>Email filtering is a really important features. You can still disable it, which
+will prevent Mailu from doing spam filtering, virus filtering, and from applying
+white and blacklists that you may configure in the admin interface. You may
+also disable the antivirus if required (it does use aroung 1GB of ram).</p>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="antispam_enabled" value="rspamd" checked>
+    Enable the spam filtering service
+  </label>
+</div>
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="antivirus_enabled" value="clamav">
+    Enable the antivirus service
+  </label>
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="webdav_enabled" value="radicale">
+    Enable the webdav service
+  </label>
+</div>
+
+<div class="form-check form-check-inline">
+  <label class="form-check-label">
+    <input class="form-check-input" type="checkbox" name="fetchmail_enabled" value="true">
+    Enable fetchmail
+  </label>
+</div>
+
+{% endcall %}
diff --git a/setup/templates/steps/stack/03_expose.html b/setup/templates/steps/stack/03_expose.html
new file mode 100644
index 00000000..58c538f0
--- /dev/null
+++ b/setup/templates/steps/stack/03_expose.html
@@ -0,0 +1,21 @@
+{% call macros.panel("info", "Step 4 - expose Mailu to the world") %}
+<p>A mail server must be exposed to the world to receive emails, send emails,
+and let users access their mailboxes. Mailu has some flexibility in the way
+you expose it to the world.</p>
+
+<div class="form-group">
+  <label>Subnet</label>
+  <input class="form-control" type="text" name="subnet" required pattern="^\d+$">
+</div>
+
+<p>You server will be available under a main hostname but may expose multiple public
+hostnames. Every e-mail domain that points to this server must have one of the
+hostnames in its <code>MX</code> record. Hostnames must be coma-separated.</p>
+
+<div class="form-group">
+  <label>Public hostnames</label>
+<!--   Validates hostname or list of hostnames -->
+  <input class="form-control" type="text" name="hostnames" placeholder="my.host.name,other.host.name" multiple required
+    	pattern="^(?:(?:\w+(?:-+\w+)*\.)+[a-z]+)*(?:,(?:(?:\w+(?:-+\w+)*\.)+[a-z]+)\s*)*$">
+</div>
+{% endcall %}
diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html
index d035a96b..b74ac1b8 100644
--- a/setup/templates/wizard.html
+++ b/setup/templates/wizard.html
@@ -15,11 +15,10 @@
   {% if flavor %}
   <form method="post" action="{{ url_for(".submit") }}">
   <input type="hidden" name="flavor" value="{{ flavor }}">
-  {% include "steps/" + flavor + "/config.html" %}
-  {% include "steps/" + flavor + "/services.html" %}
-  {% include "steps/" + flavor + "/expose.html" %}
+  {%for file in flavor_files %}
+  {% include "steps/" + flavor + "/" + file %}
+  {% endfor %}
   <input class="btn btn-primary" type="submit" value="Setup Mailu">
   {% endif %}
-<!--   {% include "steps/compose/optional.html" %} -->
   </form>
 {% endblock %}

From 9c639eebd48cfc8b49f73345a13bcb33303054d6 Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Thu, 18 Oct 2018 18:46:59 +0000
Subject: [PATCH 40/53] Made the instructions more simple (moved the nfs-volume
 example to another file) Removed he part around variable substitution as we
 can use a "trick"

---
 docs/swarm/master/README.md             | 192 +++----------
 docs/swarm/master/README_nfs_example.md | 357 ++++++++++++++++++++++++
 2 files changed, 394 insertions(+), 155 deletions(-)
 create mode 100644 docs/swarm/master/README_nfs_example.md

diff --git a/docs/swarm/master/README.md b/docs/swarm/master/README.md
index 2a2a021a..c6120228 100644
--- a/docs/swarm/master/README.md
+++ b/docs/swarm/master/README.md
@@ -29,34 +29,7 @@ mzrm9nbdggsfz4sgq6dhs5i6n     flying-dutchman     Ready               Active
 
 ### Volume definition
 For data persistance (the Mailu services might be launched/relaunched on any of the swarm nodes), we need to have Mailu data stored in a manner accessible by every manager or worker in the swarm.
-Hereafter we will use a NFS share:
-```bash
-core@coreos-01 ~ $ showmount -e 192.168.0.30
-Export list for 192.168.0.30:
-/mnt/Pool1/pv            192.168.0.0
-```
-
-on the nfs server, I am using the following /etc/exports
-```bash
-$more /etc/exports
-/mnt/Pool1/pv -alldirs -mapall=root -network 192.168.0.0 -mask 255.255.255.0 
-```
-on the nfs server, I created the Mailu directory (in fact I copied a working Mailu set-up)
-```bash
-$mkdir /mnt/Pool1/pv/mailu
-```
-
-On your manager node, mount the nfs share to check that the share is available:
-```bash
-core@coreos-01 ~ $ sudo mount -t nfs 192.168.0.30:/mnt/Pool1/pv/mailu /mnt/local/
-```
-If this is ok, you can umount it:
-```bash
-core@coreos-01 ~ $ sudo umount /mnt/local/
-```
-
-
-## Networking mode
+Hereafter we will assume that "Mailu Data" is available on every node at "$ROOT/certs:/certs". (GlusterFS and nfs shares have been successfully used)
 On this example, we are using:
 - the mesh routing mode (default mode). With this mode, each service is given a virtual IP adress and docker manages the routing between this virtual IP and the container(s) providing this service. 
 - the default ingress mode.
@@ -94,10 +67,13 @@ As a side effect of this ingress mode "feature", make sure that the ingress subn
 - redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file)
 
 ## Variable substitution and docker-compose.yml
-The docker stack deploy command doesn't support variable substitution in the .yml file itself (but we still can use .env file to pass variables to the services). As a consequence we need to adjust the docker-compose file in order to :
-- remove all variables : $VERSION , $BIND_ADDRESS4 , $BIND_ADDRESS6 , $ANTIVIRUS , $WEBMAIL , etc
+The docker stack deploy command doesn't support variable substitution in the .yml file itself. As a consequence, we need to use the following work-around:
+``` echo "$(docker-compose -f /mnt/docker/apps/mailu/docker-compose.yml config 2>/dev/null)" | docker stack deploy -c- mailu ```
+
+We need also to:
 - change the way we define the volumes (nfs share in our case)
 - add a deploy section for every service
+- the way the ports are defined for the front service
 
 ## Docker compose 
 An example of docker-compose-stack.yml file is available here:
@@ -109,7 +85,7 @@ version: '3.2'
 services:
 
   front:
-    image: mailu/nginx:master
+    image: mailu/nginx:$VERSION
     restart: always
     env_file: .env
     ports:
@@ -132,10 +108,7 @@ services:
       - target: 587
         published: 587
     volumes:
-#      - "$ROOT/certs:/certs"
-      - type: volume
-        source: mailu_certs
-        target: /certs
+      - "$ROOT/certs:/certs"
     deploy:
       replicas: 2
 
@@ -143,118 +116,77 @@ services:
     image: redis:alpine
     restart: always
     volumes:
-#      - "$ROOT/redis:/data"
-      - type: volume
-        source: mailu_redis
-        target: /data
+      - "$ROOT/redis:/data"
     deploy:
       replicas: 1
 
   imap:
-    image: mailu/dovecot:master
+    image: mailu/dovecot:$VERSION
     restart: always
     env_file: .env
     environment:
       - POD_ADDRESS_RANGE=10.0.1.0/24
     volumes:
-#      - "$ROOT/data:/data"
-      - type: volume
-        source: mailu_data
-        target: /data
-#      - "$ROOT/mail:/mail"
-      - type: volume
-        source: mailu_mail
-        target: /mail
-#      - "$ROOT/overrides:/overrides"
-      - type: volume
-        source: mailu_overrides
-        target: /overrides
+      - "$ROOT/mail:/mail"
+      - "$ROOT/overrides:/overrides"
     depends_on:
       - front
     deploy:
       replicas: 2
 
   smtp:
-    image: mailu/postfix:master
+    image: mailu/postfix:$VERSION
     restart: always
     env_file: .env
     environment:
       - POD_ADDRESS_RANGE=10.0.1.0/24
     volumes:
-#      - "$ROOT/data:/data"
-      - type: volume
-        source: mailu_data
-        target: /data
-#      - "$ROOT/overrides:/overrides"
-      - type: volume
-        source: mailu_overrides
-        target: /overrides
+      - "$ROOT/overrides:/overrides"
     depends_on:
       - front
     deploy:
       replicas: 2
 
   antispam:
-    image: mailu/rspamd:master
+    image: mailu/rspamd:$VERSION
     restart: always
     env_file: .env
     environment:
       - POD_ADDRESS_RANGE=10.0.1.0/24
+    volumes:
+      - "$ROOT/filter:/var/lib/rspamd"
+      - "$ROOT/dkim:/dkim"
+      - "$ROOT/overrides/rspamd:/etc/rspamd/override.d"
     depends_on:
       - front
-    volumes:
-#      - "$ROOT/filter:/var/lib/rspamd"
-      - type: volume
-        source: mailu_filter
-        target: /var/lib/rspamd
-#      - "$ROOT/dkim:/dkim"
-      - type: volume
-        source: mailu_dkim
-        target: /dkim
-#      - "$ROOT/overrides/rspamd:/etc/rspamd/override.d"
-      - type: volume
-        source: mailu_overrides_rspamd
-        target: /etc/rspamd/override.d
     deploy:
       replicas: 1
 
   antivirus:
-    image: mailu/none:master
+    image: mailu/none:$VERSION
     restart: always
     env_file: .env
     volumes:
-#      - "$ROOT/filter:/data"
-      - type: volume
-        source: mailu_filter
-        target: /data
+      - "$ROOT/filter:/data"
     deploy:
       replicas: 1
 
   webdav:
-    image: mailu/none:master
+    image: mailu/none:$VERSION
     restart: always
     env_file: .env
     volumes:
-#      - "$ROOT/dav:/data"
-      - type: volume
-        source: mailu_dav
-        target: /data
+      - "$ROOT/dav:/data"
     deploy:
       replicas: 1
 
   admin:
-    image: mailu/admin:master
+    image: mailu/admin:$VERSION
     restart: always
     env_file: .env
     volumes:
-#      - "$ROOT/data:/data"
-      - type: volume
-        source: mailu_data
-        target: /data
-#      - "$ROOT/dkim:/dkim"
-      - type: volume
-        source: mailu_dkim
-        target: /dkim
+      - "$ROOT/data:/data"
+      - "$ROOT/dkim:/dkim"
       - /var/run/docker.sock:/var/run/docker.sock:ro
     depends_on:
       - redis
@@ -262,28 +194,21 @@ services:
       replicas: 1
 
   webmail:
-    image: "mailu/roundcube:master"
+    image: mailu/roundcube:$VERSION
     restart: always
     env_file: .env
     volumes:
-#      - "$ROOT/webmail:/data"
-      - type: volume
-        source: mailu_data
-        target: /data
+      - "$ROOT/webmail:/data"
     depends_on:
       - imap
     deploy:
       replicas: 2
 
   fetchmail:
-    image: mailu/fetchmail:master
+    image: mailu/fetchmail:$VERSION
     restart: always
     env_file: .env
     volumes:
-#      - "$ROOT/data:/data"
-      - type: volume
-        source: mailu_data
-        target: /data
     deploy:
       replicas: 1
 
@@ -291,72 +216,29 @@ networks:
   default:
     external:
       name: mailu_default
-
-volumes:
-  mailu_filter:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/filter"
-  mailu_dkim:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/dkim"
-  mailu_overrides_rspamd:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/overrides/rspamd"
-  mailu_data:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/data"
-  mailu_mail:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/mail"
-  mailu_overrides:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/overrides"
-  mailu_dav:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/dav"
-  mailu_certs:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/certs"
-  mailu_redis:
-    driver_opts:
-      type: "nfs"
-      o: "addr=192.168.0.30,nolock,soft,rw"
-      device: ":/mnt/Pool1/pv/mailu/redis"
 ```
 
 ## Deploy Mailu on the docker swarm
 Run the following command:
 ```bash
-docker stack deploy -c docker-compose-stack.yml mailu
+echo "$(docker-compose -f /mnt/docker/apps/mailu/docker-compose.yml config 2>/dev/null)" | docker stack deploy -c- mailu
 ```
 See how the services are being deployed:
 ```bash
 core@coreos-01 ~ $ docker service ls
 ID                  NAME                                 MODE                REPLICAS            IMAGE                                     PORTS
-ywnsetmtkb1l        mailu_antivirus                      replicated          1/1                 mailu/none:1.5
-pqokiaz0q128        mailu_fetchmail                      replicated          1/1                 mailu/fetchmail:1.5
+ywnsetmtkb1l        mailu_antivirus                      replicated          1/1                 mailu/none:master
+pqokiaz0q128        mailu_fetchmail                      replicated          1/1                 mailu/fetchmail:master
 ```
 check a specific service:
 ```bash
 core@coreos-01 ~ $ docker service ps mailu_fetchmail
 ID                  NAME                IMAGE                 NODE                DESIRED STATE       CURRENT STATE         ERROR               PORTS
-tbu8ppgsdffj        mailu_fetchmail.1   mailu/fetchmail:1.5   coreos-01           Running             Running 11 days ago
+tbu8ppgsdffj        mailu_fetchmail.1   mailu/fetchmail:master   coreos-01           Running             Running 11 days ago
+```
+You might also have a look on the logs:
+```bash
+core@coreos-01 ~ $ docker service logs -f mailu_fetchmail
 ```
 
 ## Remove the stack
diff --git a/docs/swarm/master/README_nfs_example.md b/docs/swarm/master/README_nfs_example.md
new file mode 100644
index 00000000..5cfd0a73
--- /dev/null
+++ b/docs/swarm/master/README_nfs_example.md
@@ -0,0 +1,357 @@
+# Install Mailu on a docker swarm
+
+## Prequisites
+
+### Swarm
+
+In order to deploy Mailu on a swarm, you will first need to initialize the swarm:
+
+The main command will be:
+```bash
+docker swarm init --advertise-addr <IP_ADDR>
+```
+See https://docs.docker.com/engine/swarm/swarm-tutorial/create-swarm/
+
+If you want to add other managers or workers, please use:
+```bash
+docker swarm join --token xxxxx 
+```
+See https://docs.docker.com/engine/swarm/join-nodes/
+
+You have now a working swarm, and you can check its status with:
+```bash
+core@coreos-01 ~/git/Mailu/docs/swarm/1.5 $ docker node ls
+ID                            HOSTNAME            STATUS              AVAILABILITY        MANAGER STATUS      ENGINE VERSION
+xhgeekkrlttpmtgmapt5hyxrb     black-pearl         Ready               Active                                  18.06.0-ce
+sczlqjgfhehsfdjhfhhph1nvb *   coreos-01           Ready               Active              Leader              18.03.1-ce
+mzrm9nbdggsfz4sgq6dhs5i6n     flying-dutchman     Ready               Active                                  18.06.0-ce
+```
+
+### Volume definition
+For data persistance (the Mailu services might be launched/relaunched on any of the swarm nodes), we need to have Mailu data stored in a manner accessible by every manager or worker in the swarm.
+Hereafter we will use a NFS share:
+```bash
+core@coreos-01 ~ $ showmount -e 192.168.0.30
+Export list for 192.168.0.30:
+/mnt/Pool1/pv            192.168.0.0
+```
+
+on the nfs server, I am using the following /etc/exports
+```bash
+$more /etc/exports
+/mnt/Pool1/pv -alldirs -mapall=root -network 192.168.0.0 -mask 255.255.255.0 
+```
+on the nfs server, I created the Mailu directory (in fact I copied a working Mailu set-up)
+```bash
+$mkdir /mnt/Pool1/pv/mailu
+```
+
+On your manager node, mount the nfs share to check that the share is available:
+```bash
+core@coreos-01 ~ $ sudo mount -t nfs 192.168.0.30:/mnt/Pool1/pv/mailu /mnt/local/
+```
+If this is ok, you can umount it:
+```bash
+core@coreos-01 ~ $ sudo umount /mnt/local/
+```
+
+
+## Networking mode
+On this example, we are using:
+- the mesh routing mode (default mode). With this mode, each service is given a virtual IP adress and docker manages the routing between this virtual IP and the container(s) providing this service. 
+- the default ingress mode.
+
+### Allow authentification with the mesh routing
+In order to allow every (front & webmail) container to access the other services, we will use the variable POD_ADDRESS_RANGE.
+
+Let's create the mailu_default network:
+```bash
+core@coreos-01 ~ $ docker network create -d overlay --attachable mailu_default
+core@coreos-01 ~ $ docker network inspect mailu_default | grep Subnet
+                    "Subnet": "10.0.1.0/24",
+```
+In the docker-compose.yml file, we will then use POD_ADDRESS_RANGE = 10.0.1.0/24 
+In fact, imap & smtp logs doesn't show the IPs from the front(s) container(s), but the IP of  "mailu_default-endpoint". So it is sufficient to set POD_ADDRESS_RANGE to this specific ip (which can be found by inspecting mailu_default network). The issue is that this endpoint is created while the stack is created, I did'nt figure a way to determine this IP before the stack creation...
+
+### Limitation with the ingress mode
+With the default ingress mode, the front(s) container(s) will see origin IP(s) all being 10.255.0.x (which is the ingress-endpoint, can be found by inspecting the ingress network)
+
+This issue is known and discussed here:
+
+https://github.com/moby/moby/issues/25526
+
+A workaround (using network host mode and global deployment) is discussed here:
+
+https://github.com/moby/moby/issues/25526#issuecomment-336363408 
+
+### Don't create an open relay !
+As a side effect of this ingress mode "feature", make sure that the ingress subnet is not in your RELAYHOST, otherwise you would create an smtp open relay :-(
+
+
+## Scalability
+- smtp and imap are scalable
+- front and webmail are scalable (pending POD_ADDRESS_RANGE is used), although the let's encrypt magic might not like it (race condidtion ? or risk to be banned by let's encrypt server if too many front containers attemps to renew the certs at the same time) 
+- redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file)
+
+## Variable substitution and docker-compose.yml
+The docker stack deploy command doesn't support variable substitution in the .yml file itself. As a consequence, we need to use the following work-around:
+``` echo "$(docker-compose -f /mnt/docker/apps/mailu/docker-compose.yml config 2>/dev/null)" | docker stack deploy -c- mailu ```
+
+We need also to:
+- change the way we define the volumes (nfs share in our case)
+- add a deploy section for every service
+- the way the ports are defined for the front service
+
+## Docker compose 
+An example of docker-compose-stack.yml file is available here:
+
+```yaml
+
+version: '3.2'
+
+services:
+
+  front:
+    image: mailu/nginx:$VERSION
+    restart: always
+    env_file: .env
+    ports:
+      - target: 80
+        published: 80
+      - target: 443
+        published: 443
+      - target: 110
+        published: 110
+      - target: 143
+        published: 143
+      - target: 993
+        published: 993
+      - target: 995
+        published: 995
+      - target: 25
+        published: 25
+      - target: 465
+        published: 465
+      - target: 587
+        published: 587
+    volumes:
+#      - "$ROOT/certs:/certs"
+      - type: volume
+        source: mailu_certs
+        target: /certs
+    deploy:
+      replicas: 2
+
+  redis:
+    image: redis:alpine
+    restart: always
+    volumes:
+#      - "$ROOT/redis:/data"
+      - type: volume
+        source: mailu_redis
+        target: /data
+    deploy:
+      replicas: 1
+
+  imap:
+    image: mailu/dovecot:$VERSION
+    restart: always
+    env_file: .env
+    environment:
+      - POD_ADDRESS_RANGE=10.0.1.0/24
+    volumes:
+#      - "$ROOT/mail:/mail"
+      - type: volume
+        source: mailu_mail
+        target: /mail
+#      - "$ROOT/overrides:/overrides"
+      - type: volume
+        source: mailu_overrides
+        target: /overrides
+    depends_on:
+      - front
+    deploy:
+      replicas: 2
+
+  smtp:
+    image: mailu/postfix:$VERSION
+    restart: always
+    env_file: .env
+    environment:
+      - POD_ADDRESS_RANGE=10.0.1.0/24
+    volumes:
+#      - "$ROOT/overrides:/overrides"
+      - type: volume
+        source: mailu_overrides
+        target: /overrides
+    depends_on:
+      - front
+    deploy:
+      replicas: 2
+
+  antispam:
+    image: mailu/rspamd:$VERSION
+    restart: always
+    env_file: .env
+    environment:
+      - POD_ADDRESS_RANGE=10.0.1.0/24
+    depends_on:
+      - front
+    volumes:
+#      - "$ROOT/filter:/var/lib/rspamd"
+      - type: volume
+        source: mailu_filter
+        target: /var/lib/rspamd
+#      - "$ROOT/dkim:/dkim"
+      - type: volume
+        source: mailu_dkim
+        target: /dkim
+#      - "$ROOT/overrides/rspamd:/etc/rspamd/override.d"
+      - type: volume
+        source: mailu_overrides_rspamd
+        target: /etc/rspamd/override.d
+    deploy:
+      replicas: 1
+
+  antivirus:
+    image: mailu/none:$VERSION
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/filter:/data"
+      - type: volume
+        source: mailu_filter
+        target: /data
+    deploy:
+      replicas: 1
+
+  webdav:
+    image: mailu/none:$VERSION
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/dav:/data"
+      - type: volume
+        source: mailu_dav
+        target: /data
+    deploy:
+      replicas: 1
+
+  admin:
+    image: mailu/admin:$VERSION
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/data:/data"
+      - type: volume
+        source: mailu_data
+        target: /data
+#      - "$ROOT/dkim:/dkim"
+      - type: volume
+        source: mailu_dkim
+        target: /dkim
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    depends_on:
+      - redis
+    deploy:
+      replicas: 1
+
+  webmail:
+    image: mailu/roundcube:$VERSION
+    restart: always
+    env_file: .env
+    volumes:
+#      - "$ROOT/webmail:/data"
+      - type: volume
+        source: mailu_data
+        target: /data
+    depends_on:
+      - imap
+    deploy:
+      replicas: 2
+
+  fetchmail:
+    image: mailu/fetchmail:$VERSION
+    restart: always
+    env_file: .env
+    volumes:
+    deploy:
+      replicas: 1
+
+networks:
+  default:
+    external:
+      name: mailu_default
+
+volumes:
+  mailu_filter:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/filter"
+  mailu_dkim:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/dkim"
+  mailu_overrides_rspamd:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/overrides/rspamd"
+  mailu_data:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/data"
+  mailu_mail:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/mail"
+  mailu_overrides:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/overrides"
+  mailu_dav:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/dav"
+  mailu_certs:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/certs"
+  mailu_redis:
+    driver_opts:
+      type: "nfs"
+      o: "addr=192.168.0.30,soft,rw"
+      device: ":/mnt/Pool1/pv/mailu/redis"
+```
+
+## Deploy Mailu on the docker swarm
+Run the following command:
+```bash
+echo "$(docker-compose -f /mnt/docker/apps/mailu/docker-compose.yml config 2>/dev/null)" | docker stack deploy -c- mailu
+```
+See how the services are being deployed:
+```bash
+core@coreos-01 ~ $ docker service ls
+ID                  NAME                                 MODE                REPLICAS            IMAGE                                     PORTS
+ywnsetmtkb1l        mailu_antivirus                      replicated          1/1                 mailu/none:master
+pqokiaz0q128        mailu_fetchmail                      replicated          1/1                 mailu/fetchmail:master
+```
+check a specific service:
+```bash
+core@coreos-01 ~ $ docker service ps mailu_fetchmail
+ID                  NAME                IMAGE                 NODE                DESIRED STATE       CURRENT STATE         ERROR               PORTS
+tbu8ppgsdffj        mailu_fetchmail.1   mailu/fetchmail:master   coreos-01           Running             Running 11 days ago
+```
+
+## Remove the stack
+Run the follwoing command:
+```bash
+core@coreos-01 ~ $ docker stack rm mailu
+```

From 5b8deed06ba8e67ab592a20d104033a9ee63445e Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Thu, 18 Oct 2018 18:59:22 +0000
Subject: [PATCH 41/53] Made the instructions more simple Updated the volume
 defintion to the latest master status Removed the part around .yml variable
 substitution as we can use a "trick"

---
 docs/swarm/master/README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/swarm/master/README.md b/docs/swarm/master/README.md
index c6120228..ba5e0011 100644
--- a/docs/swarm/master/README.md
+++ b/docs/swarm/master/README.md
@@ -29,7 +29,9 @@ mzrm9nbdggsfz4sgq6dhs5i6n     flying-dutchman     Ready               Active
 
 ### Volume definition
 For data persistance (the Mailu services might be launched/relaunched on any of the swarm nodes), we need to have Mailu data stored in a manner accessible by every manager or worker in the swarm.
-Hereafter we will assume that "Mailu Data" is available on every node at "$ROOT/certs:/certs". (GlusterFS and nfs shares have been successfully used)
+
+Hereafter we will assume that "Mailu Data" is available on every node at "$ROOT/certs:/certs" (GlusterFS and nfs shares have been successfully used).
+
 On this example, we are using:
 - the mesh routing mode (default mode). With this mode, each service is given a virtual IP adress and docker manages the routing between this virtual IP and the container(s) providing this service. 
 - the default ingress mode.
@@ -67,13 +69,16 @@ As a side effect of this ingress mode "feature", make sure that the ingress subn
 - redis, antispam, antivirus, fetchmail, admin, webdav have not been tested (hence replicas=1 in the following docker-compose.yml file)
 
 ## Variable substitution and docker-compose.yml
-The docker stack deploy command doesn't support variable substitution in the .yml file itself. As a consequence, we need to use the following work-around:
+The docker stack deploy command doesn't support variable substitution in the .yml file itself. 
+As a consequence, we cannot simply use ``` docker stack deploy -c docker.compose.yml mailu ```
+Instead, we will use the following work-around:
 ``` echo "$(docker-compose -f /mnt/docker/apps/mailu/docker-compose.yml config 2>/dev/null)" | docker stack deploy -c- mailu ```
 
 We need also to:
 - change the way we define the volumes (nfs share in our case)
 - add a deploy section for every service
 - the way the ports are defined for the front service
+- add the POD_ADDRESS_RANGE definition imap, smtp and antispam services
 
 ## Docker compose 
 An example of docker-compose-stack.yml file is available here:

From 7a3922c2e733a9d4c9a58910e86a7dcf032e6788 Mon Sep 17 00:00:00 2001
From: ofthesun9 <olivier@vmaltair.ddns.net>
Date: Thu, 18 Oct 2018 19:14:53 +0000
Subject: [PATCH 42/53] Fixes few typos

---
 docs/swarm/master/README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/swarm/master/README.md b/docs/swarm/master/README.md
index ba5e0011..44c19dc7 100644
--- a/docs/swarm/master/README.md
+++ b/docs/swarm/master/README.md
@@ -75,10 +75,9 @@ Instead, we will use the following work-around:
 ``` echo "$(docker-compose -f /mnt/docker/apps/mailu/docker-compose.yml config 2>/dev/null)" | docker stack deploy -c- mailu ```
 
 We need also to:
-- change the way we define the volumes (nfs share in our case)
 - add a deploy section for every service
-- the way the ports are defined for the front service
-- add the POD_ADDRESS_RANGE definition imap, smtp and antispam services
+- modify the way the ports are defined for the front service
+- add the POD_ADDRESS_RANGE definition for imap, smtp and antispam services
 
 ## Docker compose 
 An example of docker-compose-stack.yml file is available here:

From 08987dfa2269a672c9d370ecfe9a7ccade2c5b81 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Fri, 19 Oct 2018 11:45:55 +0300
Subject: [PATCH 43/53] Minor changes

---
 setup/flavors/compose/setup.html              |  8 ++-
 setup/server.py                               |  4 +-
 .../templates/steps/compose/02_services.html  | 11 ---
 .../{compose/01_config.html => config.html}   | 18 +++--
 setup/templates/steps/stack/01_config.html    | 67 -------------------
 setup/templates/steps/stack/02_services.html  | 11 ---
 setup/templates/wizard.html                   |  3 +-
 7 files changed, 20 insertions(+), 102 deletions(-)
 rename setup/templates/steps/{compose/01_config.html => config.html} (84%)
 delete mode 100644 setup/templates/steps/stack/01_config.html

diff --git a/setup/flavors/compose/setup.html b/setup/flavors/compose/setup.html
index d5f7abc5..0379ba82 100644
--- a/setup/flavors/compose/setup.html
+++ b/setup/flavors/compose/setup.html
@@ -39,11 +39,13 @@ Before you can use Mailu, you must create the primary administrator user account
 <pre><code>docker-compose exec admin python manage.py admin {{ postmaster }} {{ domain }} PASSWORD
 </pre></code>
 
-Login the the admin interface to change the password for a safe one, at
+<p>Login to the admin interface to change the password for a safe one, at
 {% if admin_enabled %}
-one of the hostnames ({{ hostnames }}){{ admin_path }}.
+one of the hostnames 
+<a href="https://{{ hostnames.split(',')[0] }}{{ admin_path }}">{{ hostnames.split(',')[0] }}{{ admin_path }}</a>.
 {% else %}
-http://127.0.0.1:8080 (only directly from the host running docker).
+<a href="http://127.0.0.1:8080">http://127.0.0.1:8080</a> (only directly from the host running docker).
 {% endif %}
 And choose the "Update password" option in the left menu.
+</p>
 {% endcall %}
diff --git a/setup/server.py b/setup/server.py
index 7818e662..bfe5ef15 100644
--- a/setup/server.py
+++ b/setup/server.py
@@ -68,8 +68,8 @@ def build_app(path):
         @bp.route("/submit_flavor", methods=["POST"])
         def submit_flavor():
             data = flask.request.form.copy()
-            flavor_files = sorted(os.listdir(path + "/" + version + "/templates/steps/" + data["flavor"]))
-            return flask.render_template('wizard.html', flavor=data["flavor"], flavor_files=flavor_files)
+            steps = sorted(os.listdir(path + "/" + version + "/templates/steps/" + data["flavor"]))
+            return flask.render_template('wizard.html', flavor=data["flavor"], steps=steps)
 
         @bp.route("/submit", methods=["POST"])
         def submit():
diff --git a/setup/templates/steps/compose/02_services.html b/setup/templates/steps/compose/02_services.html
index 07bca6ba..7117c490 100644
--- a/setup/templates/steps/compose/02_services.html
+++ b/setup/templates/steps/compose/02_services.html
@@ -3,17 +3,6 @@
 interface, Web email clients (webmails), antispam, antivirus, etc. If you
 wish to disable some of these features, you are free to do so.</p>
 
-<p>The admin interface is the main Mailu-specific bit, it provides tools to
-manage your email domains, users, etc.</p>
-
-<div class="form-group">
-  <label>Enable the admin UI (and path to the admin UI)</label>
-  <div class="input-group">
-    <div class="input-group-addon"><input type="checkbox" name="admin_enabled" value="true"></div>
-    <input class="form-control" type="text" name="admin_path" value="/admin">
-  </div>
-</div>
-
 <p>Emails will be available through IMAP and POP3. You may also enable a Web
 email client. These do add some complexity but provide an easier way of
 accessing messages for beginner users.</p>
diff --git a/setup/templates/steps/compose/01_config.html b/setup/templates/steps/config.html
similarity index 84%
rename from setup/templates/steps/compose/01_config.html
rename to setup/templates/steps/config.html
index cfca8aa7..7e09f17f 100644
--- a/setup/templates/steps/compose/01_config.html
+++ b/setup/templates/steps/config.html
@@ -14,13 +14,6 @@
   		required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$">
 </div>
 
-<div class="form-check form-check-inline">
-  <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="domain_registration" value="true">
-    Domain registration
-  </label>
-</div>
-
 <div class="form-group">
   <label>Postmaster local part (will append the main mail domain)</label>
   <input class="form-control" type="text" name="postmaster" value="admin" required>
@@ -64,4 +57,15 @@
   		pattern="^(https?://)?([a-zA-Z0-9]([a-zA-ZäöüÄÖÜ0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$">
 </div>
 
+<p>The admin interface is the main Mailu-specific bit, it provides tools to
+manage your email domains, users, etc.</p>
+
+<div class="form-group">
+  <label>Enable the admin UI (and path to the admin UI)</label>
+  <div class="input-group">
+    <div class="input-group-addon"><input type="checkbox" name="admin_enabled" value="true"></div>
+    <input class="form-control" type="text" name="admin_path" value="/admin">
+  </div>
+</div>
+
 {% endcall %}
diff --git a/setup/templates/steps/stack/01_config.html b/setup/templates/steps/stack/01_config.html
deleted file mode 100644
index 8ada68a7..00000000
--- a/setup/templates/steps/stack/01_config.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{% call macros.panel("info", "Step 2 - Initial configuration") %}
-<p>Before starting some variables must be set</p>
-
-<div class="form-group">
-  <label>Root path: </label>
-<!--   Validates path -->
-  <input class="form-control" type="text" name="root" value="/mailu" required pattern="^/[-_A-Za-z0-9]+(/[-_A-Za-z0-9]*)*">
-</div>
-
-<div class="form-group">
-  <label>Main mail domain</label>
-<!--   Validates domain name -->
-  <input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io" 
-  		required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$">
-</div>
-
-<div class="form-check form-check-inline">
-  <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="domain_registration" value="true">
-    Domain registration
-  </label>
-</div>
-
-<div class="form-group">
-  <label>Postmaster local part (will append the main mail domain)</label>
-  <input class="form-control" type="text" name="postmaster" value="admin" required>
-</div>
-
-<!-- <div class="form-group"> -->
-<!--   <label>Choose how secure connections will behave </label> -->
-<!--   <br/> -->
-<!--   <select name="tls_flavor"> -->
-<!--   	{% for tlsflavor in ["letsencrypt", "cert", "notls", "mail", "mail-letsencrypt"] %} -->
-<!--   	<option value="{{ tlsflavor }}" >{{ tlsflavor }}</option> -->
-<!--   	{% endfor %} -->
-<!--   </select> -->
-<!-- </div> -->
-
-<div class="form-group">
-  <label>Authentication rate limit (per source IP address)</label>
-<!--   Validates number input only -->
-  <p><input class="form-control" style="width: 7%; display: inline;" type="number" name="auth_ratelimit_pm" 
-  		value="10" required >/minute;
-  <input class="form-control" style="width: 7%; display: inline;;" type="number" name="auth_ratelimit_ph"
-  		value="1000" required >/hour</p>
-</div>
-
-<div class="form-check form-check-inline">
-  <label class="form-check-label">
-    <input class="form-check-input" type="checkbox" name="disable_statistics" value="True">
-    Opt-out of statistics
-  </label>
-</div>
-
-<div class="form-group">
-  <label>Website name</label>
-  <input class="form-control" type="text" name="site_name" value="Mailu" required>
-</div>
-
-<div class="form-group">
-  <label>Linked Website URL</label>
-<!--   Validates url with or without https:// -->
-  <input class="form-control" type="url" name="website" value="https://mailu.io" required
-  		pattern="^(https?://)?([a-zA-Z0-9]([a-zA-ZäöüÄÖÜ0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$">
-</div>
-
-{% endcall %}
diff --git a/setup/templates/steps/stack/02_services.html b/setup/templates/steps/stack/02_services.html
index 07bca6ba..7117c490 100644
--- a/setup/templates/steps/stack/02_services.html
+++ b/setup/templates/steps/stack/02_services.html
@@ -3,17 +3,6 @@
 interface, Web email clients (webmails), antispam, antivirus, etc. If you
 wish to disable some of these features, you are free to do so.</p>
 
-<p>The admin interface is the main Mailu-specific bit, it provides tools to
-manage your email domains, users, etc.</p>
-
-<div class="form-group">
-  <label>Enable the admin UI (and path to the admin UI)</label>
-  <div class="input-group">
-    <div class="input-group-addon"><input type="checkbox" name="admin_enabled" value="true"></div>
-    <input class="form-control" type="text" name="admin_path" value="/admin">
-  </div>
-</div>
-
 <p>Emails will be available through IMAP and POP3. You may also enable a Web
 email client. These do add some complexity but provide an easier way of
 accessing messages for beginner users.</p>
diff --git a/setup/templates/wizard.html b/setup/templates/wizard.html
index b74ac1b8..05de5a5c 100644
--- a/setup/templates/wizard.html
+++ b/setup/templates/wizard.html
@@ -15,7 +15,8 @@
   {% if flavor %}
   <form method="post" action="{{ url_for(".submit") }}">
   <input type="hidden" name="flavor" value="{{ flavor }}">
-  {%for file in flavor_files %}
+  {% include "steps/config.html" %}
+  {%for file in steps %}
   {% include "steps/" + flavor + "/" + file %}
   {% endfor %}
   <input class="btn btn-primary" type="submit" value="Setup Mailu">

From 84c6b12d0621c3d1592c8228967ba8853576f0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Fri, 19 Oct 2018 11:57:02 +0300
Subject: [PATCH 44/53] Updated labels in config page

---
 setup/templates/steps/config.html | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/setup/templates/steps/config.html b/setup/templates/steps/config.html
index 7e09f17f..88c17597 100644
--- a/setup/templates/steps/config.html
+++ b/setup/templates/steps/config.html
@@ -7,20 +7,27 @@
   <input class="form-control" type="text" name="root" value="/mailu" required pattern="^/[-_A-Za-z0-9]+(/[-_A-Za-z0-9]*)*">
 </div>
 
+<p>In the next sections we need to set the postmaster address. This is a combination from the <i>postmaster</i> local part and the <i>main mail domain</i>.
+The <i>main mail domain</i> is also used as </i>"server display name"</i>. This is the way the SMTP server identifies himself when connecting to others.
+The Postmaster will get an e-mail address &lt;postmaster&gt;@&lt;main_domain&gt;. This address will receive the DMARC "rua" and "ruf" reports.
+Or in plain english: if receivers start to classify your mail as spam, this postmaster will be informed.</p>
+
 <div class="form-group">
-  <label>Main mail domain</label>
+  <label>
+    Main mail domain and server display name.
+  </label>
 <!--   Validates domain name -->
   <input class="form-control" type="text" name="domain" placeholder="e.g. mailu.io" 
   		required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$">
 </div>
 
 <div class="form-group">
-  <label>Postmaster local part (will append the main mail domain)</label>
+  <label>Postmaster local part</label>
   <input class="form-control" type="text" name="postmaster" value="admin" required>
 </div>
 
 <div class="form-group">
-  <label>Choose how secure connections will behave </label>
+  <label>Choose how you wish to handle security (TLS) certificates</label>
   <br/>
   <select class="btn btn-primary dropdown-toggle" name="tls_flavor">
   	{% for tlsflavor in ["letsencrypt", "cert", "notls", "mail", "mail-letsencrypt"] %}

From 02c802159a1ec0afebc559e0bf076d62248cc581 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Fri, 19 Oct 2018 12:53:26 +0300
Subject: [PATCH 45/53] Updated env file with the latest version

---
 setup/flavors/compose/mailu.env | 59 ++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 23 deletions(-)

diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index dc788bea..3c6e9de3 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -14,6 +14,9 @@
 # This variable is now set directly in `docker-compose.yml by the setup utility
 # ROOT={{ root }}
 
+# Mailu version to run (1.0, 1.1, etc. or master)
+#VERSION={{ version }}
+
 # Set to a randomly generated 16 bytes string
 SECRET_KEY={{ secret(16) }}
 
@@ -25,15 +28,15 @@ SECRET_KEY={{ secret(16) }}
 # Main mail domain
 DOMAIN={{ domain }}
 
-# Mail address of the postmaster
-POSTMASTER={{ postmaster }}
-
-#Chose how secure connections will behave:
-#TLS_FLAVOR={{ tls_flavor }}
-
 # Hostnames for this server, separated with comas
 HOSTNAMES={{ hostnames }}
 
+# Postmaster local part (will append the main mail domain)
+POSTMASTER={{ postmaster }}
+
+# Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
+#TLS_FLAVOR={{ tls_flavor }}
+
 # Authentication rate limit (per source IP address)
 {% if auth_ratelimit_pm > '0' and auth_ratelimit_ph > '0' %}
 AUTH_RATELIMIT={{ auth_ratelimit_pm }}/minute;{{ auth_ratelimit_ph }}/hour 
@@ -46,23 +49,23 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
 # Optional features
 ###################################
 
-#Expose the admin interface
+# Expose the admin interface (value: true, false)
 #ADMIN={{ admin_enabled or 'false' }}
 
-#Chose which webmail to run if any
+# Choose which webmail to run if any (values: roundcube, rainloop, none)
 WEBMAIL={{ webmail_type }}
 
-#Antivirus solution
+# Dav server implementation (value: radicale, none)
+WEBDAV={{ webdav_enabled or 'none' }}
+
+# Antivirus solution (value: clamav, none)
 #ANTIVIRUS={{ antivirus_enabled or 'none' }}
 
 #Antispam solution
 ANTISPAM={{ antispam_enabled or 'none'}}
 
-#Dav server implementation
-WEBDAV={{ webdav_enabled or 'none' }}
-
 ###################################
-# Server behavior
+# Mail settings
 ###################################
 
 # Message size limit in bytes
@@ -89,9 +92,9 @@ DMARC_RUF={{ dmarc_ruf or 'admin' }}
 {% if welcome_enabled %}
 # Welcome email, enable and set a topic and body if you wish to send welcome
 # emails to all users.
-WELCOME={{ welcome_enable }}
-WELCOME_SUBJECT={{ welcome_subject }}
-WELCOME_BODY={{ welcome_body }}
+WELCOME={{ welcome_enable or 'false' }}
+WELCOME_SUBJECT={{ welcome_subject or 'Welcome to your new email account' }}
+WELCOME_BODY={{ welcome_body 'Welcome to your new email account, if you can read this, then it is configured properly!' }}
 {% endif %}
 
 # Maildir Compression
@@ -100,11 +103,6 @@ COMPRESSION={{ compression }}
 # change compression-level, default: 6 (value: 1-9)
 COMPRESSION_LEVEL={{ compression_level }}
 
-{% if domain_registration %}
-# Domain registration (remove to disable)
-DOMAIN_REGISTRATION=true
-{% endif %}
-
 ###################################
 # Web settings
 ###################################
@@ -127,12 +125,27 @@ WEBSITE={{ website }}
 # RECAPTCHA_PRIVATE_KEY={{ recaptcha_private_key }}
 {% endif %}
 
+{% if domain_registration %}
+# Domain registration (remove to disable)
+DOMAIN_REGISTRATION=true
+{% endif %}
+
 ###################################
 # Advanced settings
 ###################################
 
-# Specific password storage scheme
-PASSWORD_SCHEME={{ password_scheme or 'SHA512-CRYPT'}}
+# Log driver for front service. Possible values:
+# json-file (default)
+# journald (On systemd platforms, useful for Fail2Ban integration)
+# syslog (Non systemd platforms, Fail2Ban integration. Disables `docker-compose log` for front!)
+LOG_DRIVER={{ log_driver or 'json-file' }}
+
+# Docker-compose project name, this will prepended to containers names.
+COMPOSE_PROJECT_NAME={{ compose_project_name or 'mailu' }}
+
+# Default password scheme used for newly created accounts and changed passwords
+# (value: BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
+PASSWORD_SCHEME={{ password_scheme or 'BLF-CRYPT' }}
 
 # Header to take the real ip from
 REAL_IP_HEADER={{ real_ip_header }}

From 4ccefd6d5e013ace4d8a27b6af4a26074d15b672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Fri, 19 Oct 2018 13:43:09 +0300
Subject: [PATCH 46/53] Documentation update on local docs container

---
 docs/contributors/environment.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/contributors/environment.rst b/docs/contributors/environment.rst
index a1cce193..af610c27 100644
--- a/docs/contributors/environment.rst
+++ b/docs/contributors/environment.rst
@@ -101,7 +101,8 @@ Documentation is maintained in the ``docs`` directory and are maintained as `reS
   docker build -t docs docs
   docker run -p 127.0.0.1:8080:80 docs
 
-You can now read the local documentation by navigating to http://localhost:8080.
+In a local build Docker always assumes the version to be master.
+You can read the local documentation by navigating to http://localhost:8080/master.
 
 .. note:: After modifying the documentation, the image needs to be rebuild and the container restarted for the changes to become visible.
 

From 9c56e4c1b6d948049c563d56e978b4992e3586ae Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Fri, 19 Oct 2018 14:09:58 +0300
Subject: [PATCH 47/53] Fixed misstyped condition

---
 setup/flavors/compose/mailu.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 3c6e9de3..38735c4b 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -74,7 +74,7 @@ MESSAGE_SIZE_LIMIT={{ message_size_limit or '50000000' }}
 
 # Networks granted relay permissions, make sure that you include your Docker
 # internal network (default to 172.17.0.0/16)
-RELAYNETS={{ relaynets or '172.17.0.0/16'}}
+RELAYNETS={{ relaynets or '172.17.0.0/16' }}
 
 # Will relay all outgoing mails if configured
 RELAYHOST={{ relayhost }}
@@ -94,7 +94,7 @@ DMARC_RUF={{ dmarc_ruf or 'admin' }}
 # emails to all users.
 WELCOME={{ welcome_enable or 'false' }}
 WELCOME_SUBJECT={{ welcome_subject or 'Welcome to your new email account' }}
-WELCOME_BODY={{ welcome_body 'Welcome to your new email account, if you can read this, then it is configured properly!' }}
+WELCOME_BODY={{ welcome_body or 'Welcome to your new email account, if you can read this, then it is configured properly!' }}
 {% endif %}
 
 # Maildir Compression

From 6fb0b932405b143e53ef5a9dbd66dc13baf9fc61 Mon Sep 17 00:00:00 2001
From: Hans Cornelis <hacornelis@gmail.com>
Date: Fri, 19 Oct 2018 13:39:32 +0200
Subject: [PATCH 48/53] - Removed RSPAMD Password feature - Updated roles on
 the Front DS - Reverted the Auth limits

Signed-off-by: Hans Cornelis <hacornelis@gmail.com>
---
 docs/compose/.env                          |  3 ---
 docs/kubernetes/mailu/configmap.yaml       | 11 +----------
 docs/kubernetes/mailu/front.yaml           |  4 ++--
 services/rspamd/conf/worker-controller.inc |  4 ----
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/docs/compose/.env b/docs/compose/.env
index 64981db2..7823bc3e 100644
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -55,9 +55,6 @@ WEBDAV=none
 # Antivirus solution (value: clamav, none)
 ANTIVIRUS=none
 
-# The password for the rspamd web interface
-RSPAMD_PASSWORD=Secr3tPassWord
-
 ###################################
 # Mail settings
 ###################################
diff --git a/docs/kubernetes/mailu/configmap.yaml b/docs/kubernetes/mailu/configmap.yaml
index be39fcc9..4f8dad81 100644
--- a/docs/kubernetes/mailu/configmap.yaml
+++ b/docs/kubernetes/mailu/configmap.yaml
@@ -40,7 +40,7 @@
     TLS_FLAVOR: "cert"
 
     # Authentication rate limit (per source IP address)
-    AUTH_RATELIMIT: "100/minute;10000/hour"
+    AUTH_RATELIMIT: "10/minute;1000/hour"
 
     # Opt-out of statistics, replace with "True" to opt out
     DISABLE_STATISTICS: "False"
@@ -52,7 +52,6 @@
     # Use Kubernetes Ingress Controller to handle all actions on port 80 and 443
     # This way we can make use of the advantages of the cert-manager deployment
     KUBERNETES_INGRESS: "true"
-    POD_ADDRESS_RANGE: "10.2.0.0/16"
 
     ###################################
     # Optional features
@@ -72,9 +71,6 @@
     # Antivirus solution (value: clamav, none)
     ANTIVIRUS: "clamav"
 
-    # The password for the rspamd web interface
-    RSPAMD_PASSWORD: "Secr3tPassWord"
-
     ###################################
     # Mail settings
     ###################################
@@ -83,11 +79,6 @@
     # Default: accept messages up to 50MB
     MESSAGE_SIZE_LIMIT: "50000000"
 
-    # Networks granted relay permissions, make sure that you include your Docker
-    # internal network (default to 172.17.0.0/16)
-    # For kubernetes this is the CIDR of the pod network
-    RELAYNETS: "10.2.0.0/16"
-
     # Will relay all outgoing mails if configured
     #RELAYHOST=
 
diff --git a/docs/kubernetes/mailu/front.yaml b/docs/kubernetes/mailu/front.yaml
index c13ecd9d..9951f30c 100644
--- a/docs/kubernetes/mailu/front.yaml
+++ b/docs/kubernetes/mailu/front.yaml
@@ -25,8 +25,8 @@ spec:
           requiredDuringSchedulingIgnoredDuringExecution:
             nodeSelectorTerms:
             - matchExpressions:
-              - key: node-role.kubernetes.io/master
-                operator: DoesNotExist
+              - key: node-role.kubernetes.io/node
+                operator: Exists
       hostNetwork: true
       nodeSelector:
         node-role.kubernetes.io/node: ""
diff --git a/services/rspamd/conf/worker-controller.inc b/services/rspamd/conf/worker-controller.inc
index d3ab55f4..6a020672 100644
--- a/services/rspamd/conf/worker-controller.inc
+++ b/services/rspamd/conf/worker-controller.inc
@@ -1,7 +1,3 @@
 bind_socket = "*:11334";
-{% if RSPAMD_PASSWORD %}
-password = "{{ RSPAMD_PASSWORD }}";
-{% else %}
 password = "mailu";
-{% endif %}
 secure_ip = "{{ FRONT_ADDRESS }}";

From ebaba8fb411fb4d5aff101242b7ff28ee2ad7671 Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Fri, 19 Oct 2018 15:27:18 +0300
Subject: [PATCH 49/53] Moved variables from docker-compose.yml back to env
 file

---
 setup/flavors/compose/docker-compose.yml | 3 ---
 setup/flavors/compose/mailu.env          | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index 4cebdc2c..c2846e84 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -19,9 +19,6 @@ services:
     image: mailu/nginx:{{ version }}
     restart: always
     env_file: {{ env }}
-    environment:
-      - TLS_FLAVOR={{ tls_flavor }}
-      - ADMIN={{ admin_enabled or 'false' }}
     ports:
     {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
     {% if bind4 %}
diff --git a/setup/flavors/compose/mailu.env b/setup/flavors/compose/mailu.env
index 38735c4b..9fc1197d 100644
--- a/setup/flavors/compose/mailu.env
+++ b/setup/flavors/compose/mailu.env
@@ -35,7 +35,7 @@ HOSTNAMES={{ hostnames }}
 POSTMASTER={{ postmaster }}
 
 # Choose how secure connections will behave (value: letsencrypt, cert, notls, mail, mail-letsencrypt)
-#TLS_FLAVOR={{ tls_flavor }}
+TLS_FLAVOR={{ tls_flavor }}
 
 # Authentication rate limit (per source IP address)
 {% if auth_ratelimit_pm > '0' and auth_ratelimit_ph > '0' %}
@@ -50,7 +50,7 @@ DISABLE_STATISTICS={{ disable_statistics or 'False' }}
 ###################################
 
 # Expose the admin interface (value: true, false)
-#ADMIN={{ admin_enabled or 'false' }}
+ADMIN={{ admin_enabled or 'false' }}
 
 # Choose which webmail to run if any (values: roundcube, rainloop, none)
 WEBMAIL={{ webmail_type }}

From 771e0ee6a2d21393a83b7eabd343355c03882897 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Fri, 19 Oct 2018 16:29:47 +0300
Subject: [PATCH 50/53] Remove old crypt settings from .env

As per conversation in PR
---
 docs/compose/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/compose/.env b/docs/compose/.env
index ce8e9eb9..2100e27a 100644
--- a/docs/compose/.env
+++ b/docs/compose/.env
@@ -130,7 +130,7 @@ LOG_DRIVER=json-file
 COMPOSE_PROJECT_NAME=mailu
 
 # Default password scheme used for newly created accounts and changed passwords
-# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT, MD5-CRYPT, CRYPT)
+# (value: PBKDF2, BLF-CRYPT, SHA512-CRYPT, SHA256-CRYPT)
 PASSWORD_SCHEME=PBKDF2
 
 # Header to take the real ip from

From c5be360a483affc12f506be3a85f1c79ecf2f27b Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Fri, 19 Oct 2018 17:29:35 +0300
Subject: [PATCH 51/53] Updated setup page for stack flavor

---
 setup/flavors/compose/docker-compose.yml   | 10 ----
 setup/flavors/stack/setup.html             | 61 +++++++++++++++++++++-
 setup/templates/steps/stack/03_expose.html |  2 +-
 3 files changed, 61 insertions(+), 12 deletions(-)
 mode change 120000 => 100644 setup/flavors/stack/setup.html

diff --git a/setup/flavors/compose/docker-compose.yml b/setup/flavors/compose/docker-compose.yml
index c2846e84..b01bb8fd 100644
--- a/setup/flavors/compose/docker-compose.yml
+++ b/setup/flavors/compose/docker-compose.yml
@@ -10,14 +10,12 @@ services:
   # External dependencies
   redis:
     image: redis:alpine
-    restart: always
     volumes:
       - "{{ root }}/redis:/data"
 
   # Core services
   front:
     image: mailu/nginx:{{ version }}
-    restart: always
     env_file: {{ env }}
     ports:
     {% for port in (80, 443, 25, 465, 587, 110, 995, 143, 993) %}
@@ -33,7 +31,6 @@ services:
 
   admin:
     image: mailu/admin:{{ version }}
-    restart: always
     env_file: {{ env }}
     {% if not admin_enabled %}
     ports:
@@ -47,7 +44,6 @@ services:
 
   imap:
     image: mailu/dovecot:{{ version }}
-    restart: always
     env_file: {{ env }}
     volumes:
       - "{{ root }}/mail:/mail"
@@ -57,7 +53,6 @@ services:
 
   smtp:
     image: mailu/postfix:{{ version }}
-    restart: always
     env_file: {{ env }}
     volumes:
       - "{{ root }}/overrides:/overrides"
@@ -68,7 +63,6 @@ services:
   {% if antispam_enabled %}
   antispam:
     image: mailu/rspamd:{{ version }}
-    restart: always
     env_file: {{ env }}
     volumes:
       - "{{ root }}/filter:/var/lib/rspamd"
@@ -81,7 +75,6 @@ services:
   {% if antivirus_enabled %}
   antivirus:
     image: mailu/clamav:{{ version }}
-    restart: always
     env_file: {{ env }}
     volumes:
       - "{{ root }}/filter:/data"
@@ -90,7 +83,6 @@ services:
   {% if webdav_enabled %}
   webdav:
     image: mailu/radicale:{{ version }}
-    restart: always
     env_file: {{ env }}
     volumes:
       - "{{ root }}/dav:/data"
@@ -99,7 +91,6 @@ services:
   {% if fetchmail_enabled %}
   fetchmail:
     image: mailu/fetchmail:{{ version }}
-    restart: always
     env_file: {{ env }}
   {% endif %}
 
@@ -107,7 +98,6 @@ services:
   {% if webmail_type != 'none' %}
   webmail:
     image: mailu/{{ webmail_type }}:{{ version }}
-    restart: always
     env_file: {{ env }}
     volumes:
       - "{{ root }}/webmail:/data"
diff --git a/setup/flavors/stack/setup.html b/setup/flavors/stack/setup.html
deleted file mode 120000
index ab09944c..00000000
--- a/setup/flavors/stack/setup.html
+++ /dev/null
@@ -1 +0,0 @@
-../compose/setup.html
\ No newline at end of file
diff --git a/setup/flavors/stack/setup.html b/setup/flavors/stack/setup.html
new file mode 100644
index 00000000..d68a6422
--- /dev/null
+++ b/setup/flavors/stack/setup.html
@@ -0,0 +1,60 @@
+{% import "macros.html" as macros %}
+
+{% call macros.panel("info", "Step 1 - Download your configuration files") %}
+<p>Docker Stack expects a project file, named <code>docker-compose.yml</code>
+in a project directory. First create your project directory.</p>
+
+<pre><code>mkdir -p /{{ root }}/{redis,certs,data,dkim,mail,overrides/rspamd,filter,dav,webmail}
+</pre></code>
+
+<p>Then download the project file. A side configuration file makes it easier
+to read and check the configuration variables generated by the wizard.</p>
+
+<pre><code>cd {{ root }}
+curl {{ url_for('.file', uid=uid, filepath='docker-compose.yml', _external=True) }} > docker-compose.yml
+curl {{ url_for('.file', uid=uid, filepath='mailu.env', _external=True) }} > mailu.env
+</pre></code>
+{% endcall %}
+
+
+{% call macros.panel("info", "Step 2 - Review the configuration") %}
+<p>We did not insert any malicious code on purpose in the configurations we
+distribute, but your download could have been intercepted, or our wizard
+website could have been compromised, so make sure you check the configuration
+files before going any further.</p>
+
+<p>When you are done checking them, check them one last time.</p>
+{% endcall %}
+
+{% call macros.panel("info", "Step 3 - Deploy docker stack") %}
+<p>To deploy the docker stack use the following commands. For more information about setting up docker swarm nodes read the
+	<a href="https://docs.docker.com/get-started">docker documentation</a></p>
+
+<pre><code>cd {{ root }}
+docker swarm init
+docker stack deploy -c docker-compose.yml mailu
+</pre></code>
+
+In the docker stack deploy command, mailu is the app name. Feel free to change it.<br/>
+In order to display the running container you can use<br/>
+<pre><code>docker ps</code></pre>
+or
+<pre><code>docker stack ps --no-trunc mailu</code></pre>
+Command for removing docker stack is
+<pre><code>docker stack rm mailu</code></pre>
+
+Before you can use Mailu, you must create the primary administrator user account. This should be {{ postmaster }}@{{ domain }}. Use the following command, changing PASSWORD to your liking:
+
+<pre><code>docker exec $(docker ps | grep admin | cut -d ' ' -f1) python manage.py admin {{ postmaster }} {{ domain }} PASSWORD 
+</pre></code>
+
+<p>Login to the admin interface to change the password for a safe one, at
+{% if admin_enabled %}
+one of the hostnames 
+<a href="https://{{ hostnames.split(',')[0] }}{{ admin_path }}">{{ hostnames.split(',')[0] }}{{ admin_path }}</a>.
+{% else %}
+<a href="http://127.0.0.1:8080">http://127.0.0.1:8080</a> (only directly from the host running docker).
+{% endif %}
+And choose the "Update password" option in the left menu.
+</p>
+{% endcall %}
diff --git a/setup/templates/steps/stack/03_expose.html b/setup/templates/steps/stack/03_expose.html
index 58c538f0..a9cffc1c 100644
--- a/setup/templates/steps/stack/03_expose.html
+++ b/setup/templates/steps/stack/03_expose.html
@@ -5,7 +5,7 @@ you expose it to the world.</p>
 
 <div class="form-group">
   <label>Subnet</label>
-  <input class="form-control" type="text" name="subnet" required pattern="^\d+$">
+  <input class="form-control" type="text" name="subnet" required pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))$">
 </div>
 
 <p>You server will be available under a main hostname but may expose multiple public

From 72d4fa2bc95fe4ce74b2b69137c0d3f69c95b7d6 Mon Sep 17 00:00:00 2001
From: hoellen <hoellen@users.noreply.github.com>
Date: Fri, 19 Oct 2018 22:13:38 +0200
Subject: [PATCH 52/53] remove empty line from merge conflict

---
 core/admin/mailu/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py
index 08ce8e8c..3653011f 100644
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -278,7 +278,6 @@ class User(Base, Email):
         else:
             return self.email
 
-
     @property
     def reply_active(self):
         now = date.today()

From 78bd5aea1c66422f5e1ff816dfd0e71174d8db7f Mon Sep 17 00:00:00 2001
From: Paul Williams <williamspaul@google.com>
Date: Fri, 19 Oct 2018 11:51:33 -0600
Subject: [PATCH 53/53] enable http2, because it's that easy

---
 core/nginx/conf/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 7eaba003..3f2e9a42 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -48,8 +48,8 @@ http {
 
       # Only enable HTTPS if TLS is enabled with no error
       {% if TLS and not TLS_ERROR %}
-      listen 443 ssl;
-      listen [::]:443 ssl;
+      listen 443 ssl http2;
+      listen [::]:443 ssl http2;
 
       include /etc/nginx/tls.conf;
       ssl_session_cache shared:SSLHTTP:50m;