external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2026-05-23 05:48:59 +02:00
Code Issues Releases Wiki Activity

Merge with master and rename MIAB to Mail-in-a-Box Management Daemon

Browse Source
This commit is contained in:
Michael Kroes
2016-04-07 10:45:57 +02:00
parent 08415d4f55 30c89be982
commit 9fe0be0b4f
9 changed files with 43 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
management/daemon.py
View File

@@ -603,7 +603,7 @@ def log_failed_login(request):
# We need to add a timestamp to the log message, otherwise /dev/log will eat the "duplicate"
# message.
app.logger.warning( "MIAB: Failed login attempt from ip %s - timestamp %s" % (ip, time.time()))
app.logger.warning( "Mail-in-a-Box Management Daemon: Failed login attempt from ip %s - timestamp %s" % (ip, time.time()))
# APP

1
management/templates/custom-dns.html
View File

@@ -36,6 +36,7 @@
<option value="CNAME" data-hint="Enter another domain name followed by a period at the end (e.g. mypage.github.io.).">CNAME (DNS forwarding)</option>
<option value="TXT" data-hint="Enter arbitrary text.">TXT (text record)</option>
<option value="MX" data-hint="Enter record in the form of PRIORIY DOMAIN., including trailing period (e.g. 20 mx.example.com.).">MX (mail exchanger)</option>
<option value="SRV" data-hint="Enter record in the form of PRIORIY WEIGHT PORT TARGET., including trailing period (e.g. 10 10 5060 sip.example.com.).">SRV (service record)</option>
</select>
</div>
</div>