starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 19:02:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Try and make ncurses less ugly

Browse Source
This commit is contained in:
Brad Warren
2016-04-04 09:49:56 -07:00
parent 22c924bb1c
commit bf0c2306c6
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt/plugins/webroot.py
+4 -7
View File
@@ -38,15 +38,14 @@ to serve all files under specified web root ({0})."""
_INTERACTIVE_CANCEL = ("Every requested domain must have a " _INTERACTIVE_CANCEL = ("Every requested domain must have a "
"webroot when using the webroot plugin.") "webroot when using the webroot plugin.")
_INPUT_HELP_FMT = ( _INPUT_HELP = (
"To use the webroot plugin, you need to have an HTTP server " "To use the webroot plugin, you need to have an HTTP server "
"running on this system serving files for the requested " "running on this system serving files for the requested "
"domain. Additionally, this server should be serving all " "domain. Additionally, this server should be serving all "
"files contained in a public_html or webroot directory. The " "files contained in a public_html or webroot directory. The "
"webroot plugin works by temporarily saving necessary " "webroot plugin works by temporarily saving necessary "
"resources in the HTTP server's webroot directory to pass " "resources in the HTTP server's webroot directory to pass "
"domain validation challenges.\n\nTo continue, you need to " "domain validation challenges.")
"provide the webroot directory for {0}.")
def more_info(self): # pylint: disable=missing-docstring,no-self-use def more_info(self): # pylint: disable=missing-docstring,no-self-use
return self.MORE_INFO.format(self.conf("path")) return self.MORE_INFO.format(self.conf("path"))
@@ -119,7 +118,7 @@ to serve all files under specified web root ({0})."""
if code == display_util.CANCEL: if code == display_util.CANCEL:
raise errors.PluginError(self._INTERACTIVE_CANCEL) raise errors.PluginError(self._INTERACTIVE_CANCEL)
elif code == display_util.HELP: elif code == display_util.HELP:
display.notification(self._INPUT_HELP_FMT.format(domain)) display.notification(self._INPUT_HELP)
else: # code == display_util.OK else: # code == display_util.OK
if index == 0: if index == 0:
break break
@@ -134,9 +133,7 @@ to serve all files under specified web root ({0})."""
elif code == display_util.HELP: elif code == display_util.HELP:
# Help can currently only be selected # Help can currently only be selected
# when using the ncurses interface # when using the ncurses interface
display.notification(''.join( display.notification(display_util.DSELECT_HELP)
(self._INPUT_HELP_FMT.format(domain),
"\n\n", display_util.DSELECT_HELP,)))
else: else:
try: try:
return _validate_webroot(webroot) return _validate_webroot(webroot)