lub
/
mailu
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Minor changes

Browse Source
master
Ionut Filip 6 years ago
parent 35193f5530
commit 08987dfa22
7 changed files with 20 additions and 102 deletions
Show Stats Download Patch File Download Diff File

8
setup/flavors/compose/setup.html
Unescape Escape View File

@ -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>docker-compose exec admin python manage.py admin {{ postmaster }} {{ domain }} PASSWORD
</pre></code> </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 %} {% 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 %} {% 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 %} {% endif %}
And choose the "Update password" option in the left menu. And choose the "Update password" option in the left menu.
</p>
{% endcall %} {% endcall %}

4
setup/server.py
Unescape Escape View File

@ -68,8 +68,8 @@ def build_app(path):
@bp.route("/submit_flavor", methods=["POST"]) @bp.route("/submit_flavor", methods=["POST"])
def submit_flavor(): def submit_flavor():
data = flask.request.form.copy() data = flask.request.form.copy()
flavor_files = sorted(os.listdir(path + "/" + version + "/templates/steps/" + data["flavor"])) steps = sorted(os.listdir(path + "/" + version + "/templates/steps/" + data["flavor"]))
return flask.render_template('wizard.html', flavor=data["flavor"], flavor_files=flavor_files) return flask.render_template('wizard.html', flavor=data["flavor"], steps=steps)
@bp.route("/submit", methods=["POST"]) @bp.route("/submit", methods=["POST"])
def submit(): def submit():

11
setup/templates/steps/compose/02_services.html
Unescape Escape View File

@ -3,17 +3,6 @@
interface, Web email clients (webmails), antispam, antivirus, etc. If you interface, Web email clients (webmails), antispam, antivirus, etc. If you
wish to disable some of these features, you are free to do so.</p> 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 <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 email client. These do add some complexity but provide an easier way of
accessing messages for beginner users.</p> accessing messages for beginner users.</p>

18
setup/templates/steps/compose/01_config.html → setup/templates/steps/config.html
Unescape Escape View File

@ -14,13 +14,6 @@
required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$"> required pattern="^([a-z0-9]+(-[a-z0-9]+)*\.)+[a-z]{2,}$">
</div> </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"> <div class="form-group">
<label>Postmaster local part (will append the main mail domain)</label> <label>Postmaster local part (will append the main mail domain)</label>
<input class="form-control" type="text" name="postmaster" value="admin" required> <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}$"> pattern="^(https?://)?([a-zA-Z0-9]([a-zA-ZäöüÄÖÜ0-9\-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,6}$">
</div> </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 %} {% endcall %}

67
setup/templates/steps/stack/01_config.html
Unescape Escape View File

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

11
setup/templates/steps/stack/02_services.html
Unescape Escape View File

@ -3,17 +3,6 @@
interface, Web email clients (webmails), antispam, antivirus, etc. If you interface, Web email clients (webmails), antispam, antivirus, etc. If you
wish to disable some of these features, you are free to do so.</p> 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 <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 email client. These do add some complexity but provide an easier way of
accessing messages for beginner users.</p> accessing messages for beginner users.</p>

3
setup/templates/wizard.html
Unescape Escape View File

@ -15,7 +15,8 @@
{% if flavor %} {% if flavor %}
<form method="post" action="{{ url_for(".submit") }}"> <form method="post" action="{{ url_for(".submit") }}">
<input type="hidden" name="flavor" value="{{ flavor }}"> <input type="hidden" name="flavor" value="{{ flavor }}">
{%for file in flavor_files %} {% include "steps/config.html" %}
{%for file in steps %}
{% include "steps/" + flavor + "/" + file %} {% include "steps/" + flavor + "/" + file %}
{% endfor %} {% endfor %}
<input class="btn btn-primary" type="submit" value="Setup Mailu"> <input class="btn btn-primary" type="submit" value="Setup Mailu">

Write Preview
Loading…
Cancel
Save