diff options
| author | Brad Warren <bmw@users.noreply.github.com> | 2019-08-09 02:36:45 +0300 |
|---|---|---|
| committer | ohemorange <ebportnoy@gmail.com> | 2019-08-09 02:36:45 +0300 |
| commit | e21401004b9a57c5c721ee0b914a73b39e6e4a42 (patch) | |
| tree | 374026d79f587eece4c4979fa6091037b17fb105 /certbot-apache/certbot_apache/override_suse.py | |
| parent | 987ce2c6b29d30d898e8032f3f19d174adbd4c48 (diff) | |
Revert disabling TLS session tickets in Apache (#7315) (#7316)
See https://community.letsencrypt.org/t/ssl-error-after-cert-renew/99430.
The first commit of this PR is a simple, clean revert of #7191. Subsequent commits add back pieces of that PR we want to keep.
I also reverted #7299 which landed in a separate PR, but needs to be reverted to keep including the TLS config files in the certbot-apache package when it is built.
I tested this on Ubuntu 18.04 by installing a cert to Apache using Certbot master and then running certbot renew with this branch. I watched the Apache plugin update the configuration file to remove SSLSessionTickets off.
* Revert "Disable TLS session tickets for Apache 2.4.11+ (#7191)"
This reverts commit 9174c631d9965834f263ea7ff842d8d2087f47c7.
* Keep hashes with TLS session tickets disabled.
* dont delete changelog entries
* add changelog entry
* Revert "Clean the useless entries in MANIFEST.in (#7299)"
This reverts commit f4d17d9a6b0f2ba997cdc8da75dd60c1bbf5ebf1.
(cherry picked from commit 120137eb8dc0640cc4bd8c66e710415bf9b164c2)
Diffstat (limited to 'certbot-apache/certbot_apache/override_suse.py')
| -rw-r--r-- | certbot-apache/certbot_apache/override_suse.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/certbot-apache/certbot_apache/override_suse.py b/certbot-apache/certbot_apache/override_suse.py index 4baa57497..3d0043afe 100644 --- a/certbot-apache/certbot_apache/override_suse.py +++ b/certbot-apache/certbot_apache/override_suse.py @@ -1,4 +1,6 @@ """ Distribution specific override class for OpenSUSE """ +import pkg_resources + import zope.interface from certbot import interfaces @@ -24,4 +26,6 @@ class OpenSUSEConfigurator(configurator.ApacheConfigurator): handle_modules=False, handle_sites=False, challenge_location="/etc/apache2/vhosts.d", + MOD_SSL_CONF_SRC=pkg_resources.resource_filename( + "certbot_apache", "options-ssl-apache.conf") ) |