external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-03 00:07:05 +00:00
Code Issues Releases Wiki Activity

merge upstream v62

Browse Source
This commit is contained in:
KiekerJan 2023-05-21 11:41:24 +02:00
parent 3a2d887120
commit 67b806b326
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -6,9 +6,8 @@ Version 62 (May 20, 2023)
Package updates:
* Nextcloud updated to 23.0.12 (and its apps also updated).
* Nextcloud updated to 25.0.06 (and its apps also updated).
* Roundcube updated to 1.6.1.
* Z-Push to 2.7.0, which has compatibility for Ubuntu 22.04, so it works again.
Mail:

2
README.md
View File

@ -20,7 +20,7 @@ Functionality changes and additions
* Configure domain names for which only www will be hosted
Edit /etc/miabwwwdomains.conf to configure. The box will handle incoming traffic asking for these domain names. The DNS entries are entered in an external DNS provider! If you want this box to handle the DNS entries, simply add a mail alias. (existing functionality of the vanilla Mail-in-a-Box)
* Add some munin plugins
* Update nextcloud to 24.0.0
* Update nextcloud to 25.0.6
And updated apps
* Add nextcloud notes app
* Add roundcube context menu plugin

4
management/email_administrator.py
View File

@ -46,7 +46,9 @@ msg['From'] = "\"%s\" <%s>" % (env['PRIMARY_HOSTNAME'], admin_addr)
msg['To'] = admin_addr
msg['Subject'] = "[%s] %s" % (env['PRIMARY_HOSTNAME'], subject)
content_html = '<html><body><pre style="overflow-x: scroll; white-space: pre;">{}</pre></body></html>'.format(html.escape(content))
#content_html = '<html><body><pre style="overflow-x: scroll; white-space: pre;">{}</pre></body></html>'.format(html.escape(content))
content_html = '<html><body><pre style="white-space: pre;">{}</pre></body></html>'.format(html.escape(content))
#content_html = '<html><body><pre>{}</pre></body></html>'.format(html.escape(content))
msg.attach(MIMEText(content, 'plain'))
msg.attach(MIMEText(content_html, 'html'))