diff options
author | Brad Warren <bmw@users.noreply.github.com> | 2018-11-20 03:21:45 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-20 03:21:45 +0300 |
commit | 000fc0b751e140f6055c524f012d932c62a929e6 (patch) | |
tree | baa3b40570dffb4b691074739d7845dc675503a1 /certbot-apache/certbot_apache/configurator.py | |
parent | 5e9a5e4daa23bae848ddff76c6964e31f9f68e8f (diff) | |
parent | 9fd4bf3dfa9ad214bff896c63a3649e28b83463c (diff) |
Merge pull request #6498 from certbot/fix-merge-conflicts
Fix merge conflicts in test-everything
Diffstat (limited to 'certbot-apache/certbot_apache/configurator.py')
-rw-r--r-- | certbot-apache/certbot_apache/configurator.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/certbot-apache/certbot_apache/configurator.py b/certbot-apache/certbot_apache/configurator.py index da632dc81..f431b9dab 100644 --- a/certbot-apache/certbot_apache/configurator.py +++ b/certbot-apache/certbot_apache/configurator.py @@ -2253,7 +2253,7 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): ########################################################################### def get_chall_pref(self, unused_domain): # pylint: disable=no-self-use """Return list of challenge preferences.""" - return [challenges.TLSSNI01, challenges.HTTP01] + return [challenges.HTTP01, challenges.TLSSNI01] def perform(self, achalls): """Perform the configuration related challenge. |