1
0
mirror of https://github.com/laurivosandi/certidude synced 2024-12-23 00:25:18 +00:00

Fix mailbox configuration in the web interface

This commit is contained in:
Lauri Võsandi 2017-02-08 20:22:26 +00:00
parent 2a8109704a
commit b0e7ad9540
2 changed files with 15 additions and 13 deletions

View File

@ -55,9 +55,13 @@ class SessionResource(object):
[req.context.get("remote_addr") in j [req.context.get("remote_addr") in j
for j in config.REQUEST_SUBNETS]), for j in config.REQUEST_SUBNETS]),
authority = dict( authority = dict(
outbox = dict(
server = config.OUTBOX,
name = config.OUTBOX_NAME,
mail = config.OUTBOX_MAIL
),
user_certificate_enrollment=config.USER_CERTIFICATE_ENROLLMENT, user_certificate_enrollment=config.USER_CERTIFICATE_ENROLLMENT,
user_mutliple_certificates=config.USER_MULTIPLE_CERTIFICATES, user_mutliple_certificates=config.USER_MULTIPLE_CERTIFICATES,
outbox = config.OUTBOX,
certificate = authority.certificate, certificate = authority.certificate,
events = config.EVENT_SOURCE_SUBSCRIBE % config.EVENT_SOURCE_TOKEN, events = config.EVENT_SOURCE_SUBSCRIBE % config.EVENT_SOURCE_TOKEN,
requests=authority.list_requests(), requests=authority.list_requests(),

View File

@ -13,17 +13,21 @@ for current user account.</p>
<h2>Authority certificate</h2> <h2>Authority certificate</h2>
<p>Several things such as CRL location and e-mails are hardcoded into <p>Several things are hardcoded into the <a href="/api/certificate">certificate</a> and
the <a href="/api/certificate">certificate</a> and as such require complete reset of X509 infrastructure if some of them needs to be changed.</p>
as such require complete reset of X509 infrastructure if some of them needs to be changed:</p>
<p>Mails will appear from: {{ session.authority.certificate.email_address }}</p>
<h2>Authority settings</h2> <h2>Authority settings</h2>
<p>These can be reconfigured via /etc/certidude/server.conf on the server.</p> <p>These can be reconfigured via /etc/certidude/server.conf on the server.</p>
{% if session.authority.outbox %}
<p>Outgoing mail server: {{ session.authority.outbox.server }}</p>
<p>Mails will appear from: {{ session.authority.outbox.name }} &lt;{{ session.authority.outbox.mail }}&gt;</p>
{% else %}
<p>E-mail disabled</p>
{% endif %}
<p>User certificate enrollment: <p>User certificate enrollment:
{% if session.authority.user_certificate_enrollment %} {% if session.authority.user_certificate_enrollment %}
{% if session.authority.user_mutliple_certificates %} {% if session.authority.user_mutliple_certificates %}
@ -37,12 +41,6 @@ forbidden
{% endif %} {% endif %}
</p> </p>
<p>Outgoing mail server:
{% if session.authority.outbox %}
{{ session.authority.outbox }}
{% else %}
E-mail disabled
{% endif %}</p>
<p>Web signed certificate attributes:</p> <p>Web signed certificate attributes:</p>