self-hosted/Mailu
1
0
Fork 0
mirror of https://github.com/Mailu/Mailu.git synced 2025-11-27 22:18:22 +02:00
Code Issues Releases Activity

Merge branch 'master' into refactor-repo

Browse Source
This commit is contained in:
kaiyou
2017-11-01 18:29:25 +01:00
parent c59e05bb09 f9708e874a
commit ac53b3ed97
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/admin/mailu/ui/templates/services.html
View File

@@ -5,7 +5,7 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% call table() %} {% call macros.table() %}
<tr> <tr>
<th>{% trans %}Service{% endtrans %}</th> <th>{% trans %}Service{% endtrans %}</th>
<th>{% trans %}Status{% endtrans %}</th> <th>{% trans %}Status{% endtrans %}</th>

20
core/admin/mailu/ui/templates/token/list.html
View File

@@ -12,25 +12,23 @@
<a class="btn btn-primary" href="{{ url_for('.token_create', user_email=user.email) }}">{% trans %}New token{% endtrans %}</a> <a class="btn btn-primary" href="{{ url_for('.token_create', user_email=user.email) }}">{% trans %}New token{% endtrans %}</a>
{% endblock %} {% endblock %}
{% block box %} {% block content %}
<table class="table table-bordered"> {% call macros.table() %}
<tbody> <tr>
<tr>
<th>{% trans %}Actions{% endtrans %}</th> <th>{% trans %}Actions{% endtrans %}</th>
<th>{% trans %}Comment{% endtrans %}</th> <th>{% trans %}Comment{% endtrans %}</th>
<th>{% trans %}Authorized IP{% endtrans %}</th> <th>{% trans %}Authorized IP{% endtrans %}</th>
<th>{% trans %}Created{% endtrans %}</th> <th>{% trans %}Created{% endtrans %}</th>
</tr> </tr>
{% for token in user.tokens %} {% for token in user.tokens %}
<tr> <tr>
<td> <td>
<a href="{{ url_for('.token_delete', token_id=token.id) }}" title="{% trans %}Delete{% endtrans %}"><i class="fa fa-trash"></i></a> <a href="{{ url_for('.token_delete', token_id=token.id) }}" title="{% trans %}Delete{% endtrans %}"><i class="fa fa-trash"></i></a>
</td> </td>
<td>{{ token.comment }}</td> <td>{{ token.comment }}</td>
<td>{{ token.ip or "any" }}</td> <td>{{ token.ip or "any" }}</td>
<td>{{ token.created_at }}</td> <td>{{ token.created_at }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> {% endcall %}
</table>
{% endblock %} {% endblock %}

2
core/nginx/conf/nginx.conf
View File

@@ -42,7 +42,7 @@ http {
# In any case, enable the proxy for certbot if the flavor is letsencrypt # In any case, enable the proxy for certbot if the flavor is letsencrypt
{% if TLS_FLAVOR == 'letsencrypt' %} {% if TLS_FLAVOR == 'letsencrypt' %}
location ^~ /.well-known/acme-challenge/ { location ^~ /.well-known/acme-challenge/ {
proxy_pass http://localhost:8000; proxy_pass http://localhost:8008;
} }
{% endif %} {% endif %}

2
core/nginx/letsencrypt.py
View File

@@ -12,7 +12,7 @@ command = [
"-m", "{}@{}".format(os.environ["POSTMASTER"], os.environ["DOMAIN"]), "-m", "{}@{}".format(os.environ["POSTMASTER"], os.environ["DOMAIN"]),
"certonly", "--standalone", "certonly", "--standalone",
"--cert-name", "mailu", "--cert-name", "mailu",
"--preferred-challenges", "http", "--http-01-port", "8000", "--preferred-challenges", "http", "--http-01-port", "8008",
"--keep-until-expiring", "--keep-until-expiring",
"--rsa-key-size", "4096", "--rsa-key-size", "4096",
"--config-dir", "/certs/letsencrypt", "--config-dir", "/certs/letsencrypt",