mirror of
https://github.com/Mailu/Mailu.git
synced 2024-12-12 10:45:38 +02:00
Merge branch 'master' of https://github.com/Mailu/Mailu into ratelimits
This commit is contained in:
commit
7d56ed3b70
@ -60,7 +60,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:
|
||||
|
1
towncrier/newsfragments/1990.bugfix
Normal file
1
towncrier/newsfragments/1990.bugfix
Normal file
@ -0,0 +1 @@
|
||||
Fixed roundcube sso login not working.
|
@ -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/
|
||||
|
Loading…
Reference in New Issue
Block a user