Merge remote-tracking branch 'origin/master' into split-plugin-selection

Conflicts on "none" -> "None"
This commit is contained in:
Peter Eckersley
2016-03-24 18:03:26 -07:00
6 changed files with 127 additions and 24 deletions
+1 -1
View File
@@ -463,7 +463,7 @@ def config_changes(config, unused_plugins):
def revoke(config, unused_plugins): # TODO: coop with renewal config
"""Revoke a previously obtained certificate."""
# For user-agent construction
config.namespace.installer = config.namespace.authenticator = "none"
config.namespace.installer = config.namespace.authenticator = "None"
if config.key_path is not None: # revocation by cert key
logger.debug("Revoking %s using cert key %s",
config.cert_path[0], config.key_path[0])