Merge branch 'master' into refactor-repo

core/admin/mailu/ui/templates/services.html

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

core/admin/mailu/ui/templates/token/list.html

@@ -12,25 +12,23 @@
 <a class="btn btn-primary" href="{{ url_for('.token_create', user_email=user.email) }}">{% trans %}New token{% endtrans %}</a>
 {% 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 %}
+{% endcall %}
-  </tbody>
-</table>
 {% endblock %}

core/nginx/conf/nginx.conf

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

core/nginx/letsencrypt.py

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