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/apache_util.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/apache_util.py')
-rw-r--r-- | certbot-apache/certbot_apache/apache_util.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/certbot-apache/certbot_apache/apache_util.py b/certbot-apache/certbot_apache/apache_util.py index f338c0407..7a2ecf49b 100644 --- a/certbot-apache/certbot_apache/apache_util.py +++ b/certbot-apache/certbot_apache/apache_util.py @@ -1,8 +1,6 @@ """ Utility functions for certbot-apache plugin """ import binascii -import pkg_resources - from certbot import util from certbot.compat import os @@ -107,15 +105,3 @@ def parse_define_file(filepath, varname): def unique_id(): """ Returns an unique id to be used as a VirtualHost identifier""" return binascii.hexlify(os.urandom(16)).decode("utf-8") - - -def find_ssl_apache_conf(prefix): - """ - Find a TLS Apache config file in the dedicated storage. - :param str prefix: prefix of the TLS Apache config file to find - :return: the path the TLS Apache config file - :rtype: str - """ - return pkg_resources.resource_filename( - "certbot_apache", - os.path.join("tls_configs", "{0}-options-ssl-apache.conf".format(prefix))) |