Added vars and fixed naming use

master
Ionut Filip 6 years ago
parent 0d164486b4
commit e8dee22ecf

@ -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

@ -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

@ -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 %}

@ -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 %}

@ -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 %}

@ -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>

Loading…
Cancel
Save