starred/certbot-certbot-2
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-07-28 08:05:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts on "none" -> "None"
This commit is contained in:
Peter Eckersley
2016-03-24 18:03:26 -07:00
parent 7b434c5a88 8d9ab3fbac
commit 6da12cb6a7
6 changed files with 127 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/plugins/selection.py
+2 -2
View File
@@ -137,8 +137,8 @@ noninstaller_plugins = ["webroot", "manual", "standalone"]
def record_chosen_plugins(config, plugins, auth, inst):
"Update the config entries to reflect the plugins we actually selected."
cn = config.namespace
cn.authenticator = plugins.find_init(auth).name if auth else "none"
cn.installer = plugins.find_init(inst).name if inst else "none"
cn.authenticator = plugins.find_init(auth).name if auth else "None"
cn.installer = plugins.find_init(inst).name if inst else "None"
def choose_configurator_plugins(config, plugins, verb):