From 1e07b85fa132a22da11aa5603764f4fc3df729d4 Mon Sep 17 00:00:00 2001
From: Florent Daigniere <nextgens@freenetproject.org>
Date: Fri, 24 Sep 2021 10:20:21 +0200
Subject: [PATCH 1/3] doh

---
 core/admin/mailu/utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/admin/mailu/utils.py b/core/admin/mailu/utils.py
index 34f52d8c..a77cef47 100644
--- a/core/admin/mailu/utils.py
+++ b/core/admin/mailu/utils.py
@@ -58,7 +58,7 @@ def has_dane_record(domain, timeout=10):
         # we will receive this non-specific exception. The safe behaviour is to
         # accept to defer the email.
         flask.current_app.logger.warn(f'Unable to lookup the TLSA record for {domain}. Is the DNSSEC zone okay on https://dnsviz.net/d/{domain}/dnssec/?')
-        return app.config['DEFER_ON_TLS_ERROR']
+        return flask.current_app.config['DEFER_ON_TLS_ERROR']
     except dns.exception.Timeout:
         flask.current_app.logger.warn(f'Timeout while resolving the TLSA record for {domain} ({timeout}s).')
     except dns.resolver.NXDOMAIN:

From 7083b3f7c61c398e5fa41e8bd966014f9919ce3f Mon Sep 17 00:00:00 2001
From: Diman0 <diman@huisman.xyz>
Date: Fri, 24 Sep 2021 12:10:21 +0200
Subject: [PATCH 2/3] Fix roundcube sso header issue Removed apache rewrite
 module.

---
 webmails/roundcube/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webmails/roundcube/Dockerfile b/webmails/roundcube/Dockerfile
index f4399f70..df83bc83 100644
--- a/webmails/roundcube/Dockerfile
+++ b/webmails/roundcube/Dockerfile
@@ -39,7 +39,7 @@ RUN apt-get update && apt-get install -y \
  && sed -i 's,^php_value.*upload_max_filesize,#&,g' .htaccess \
  && chown -R www-data: logs temp \
  && rm -rf /var/lib/apt/lists \
- && a2enmod rewrite deflate expires headers
+ && a2enmod deflate expires headers
 
 COPY php.ini /php.ini
 COPY config.inc.php /var/www/html/config/

From e3fa74768ab94881e99187b0eb5c87d9d6add332 Mon Sep 17 00:00:00 2001
From: Diman0 <diman@huisman.xyz>
Date: Fri, 24 Sep 2021 12:16:42 +0200
Subject: [PATCH 3/3] Add newsfragment.

---
 towncrier/newsfragments/1990.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 towncrier/newsfragments/1990.bugfix

diff --git a/towncrier/newsfragments/1990.bugfix b/towncrier/newsfragments/1990.bugfix
new file mode 100644
index 00000000..394fc05b
--- /dev/null
+++ b/towncrier/newsfragments/1990.bugfix
@@ -0,0 +1 @@
+Fixed roundcube sso login not working.