hazza/jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/jupyterhub.git synced 2025-10-12 12:33:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1362 from stuartcampbell/master

Browse Source 
Improve help comments for SSL key/certs configuration parameters
This commit is contained in:
Min RK
2017-08-26 09:41:47 -04:00
committed by GitHub
parent 92f034766e 1b7f54b462
commit a640a468fb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
jupyterhub/app.py
View File

@@ -291,13 +291,13 @@ class JupyterHub(Application):
ssl_key = Unicode('', ssl_key = Unicode('',
help="""Path to SSL key file for the public facing interface of the proxy help="""Path to SSL key file for the public facing interface of the proxy
Use with ssl_cert When setting this, you should also set ssl_cert
""" """
).tag(config=True) ).tag(config=True)
ssl_cert = Unicode('', ssl_cert = Unicode('',
help="""Path to SSL certificate file for the public facing interface of the proxy help="""Path to SSL certificate file for the public facing interface of the proxy
Use with ssl_key When setting this, you should also set ssl_key
""" """
).tag(config=True) ).tag(config=True)
ip = Unicode('', ip = Unicode('',
@@ -360,7 +360,7 @@ class JupyterHub(Application):
proxy_cmd = Command([], config=True, proxy_cmd = Command([], config=True,
help="DEPRECATED since version 0.8. Use ConfigurableHTTPProxy.command", help="DEPRECATED since version 0.8. Use ConfigurableHTTPProxy.command",
).tag(config=True) ).tag(config=True)
debug_proxy = Bool(False, debug_proxy = Bool(False,
help="DEPRECATED since version 0.8: Use ConfigurableHTTPProxy.debug", help="DEPRECATED since version 0.8: Use ConfigurableHTTPProxy.debug",
).tag(config=True) ).tag(config=True)
@@ -465,7 +465,7 @@ class JupyterHub(Application):
help="""The cookie secret to use to encrypt cookies. help="""The cookie secret to use to encrypt cookies.
Loaded from the JPY_COOKIE_SECRET env variable by default. Loaded from the JPY_COOKIE_SECRET env variable by default.
Should be exactly 256 bits (32 bytes). Should be exactly 256 bits (32 bytes).
""" """
).tag( ).tag(
@@ -1568,7 +1568,7 @@ class JupyterHub(Application):
break break
else: else:
self.log.error("Cannot connect to %s service %s at %s. Is it running?", service.kind, service_name, service.url) self.log.error("Cannot connect to %s service %s at %s. Is it running?", service.kind, service_name, service.url)
yield self.proxy.check_routes(self.users, self._service_map) yield self.proxy.check_routes(self.users, self._service_map)