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 01/19] 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 02/19] 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 03/19] 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 04/19] 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 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 05/19] 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 06/19] 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 07/19] 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 08/19] 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 09/19] 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 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 10/19] 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 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 11/19] 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 12/19] 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 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 13/19] 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 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 14/19] 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 15/19] 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 16/19] 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 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 17/19] 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 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 18/19] 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 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 19/19] 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